{"action":"closed","issue":{"url":"https://api.github.com/repos/vowsjs/vows/issues/348","labels_url":"https://api.github.com/repos/vowsjs/vows/issues/348/labels{/name}","comments_url":"https://api.github.com/repos/vowsjs/vows/issues/348/comments","events_url":"https://api.github.com/repos/vowsjs/vows/issues/348/events","html_url":"https://github.com/vowsjs/vows/issues/348","id":55776463,"number":348,"title":"Please get rid of redundant commits","user":{"login":"silkentrance","id":6068824,"avatar_url":"https://avatars.githubusercontent.com/u/6068824?v=3","gravatar_id":"","url":"https://api.github.com/users/silkentrance","html_url":"https://github.com/silkentrance","followers_url":"https://api.github.com/users/silkentrance/followers","following_url":"https://api.github.com/users/silkentrance/following{/other_user}","gists_url":"https://api.github.com/users/silkentrance/gists{/gist_id}","starred_url":"https://api.github.com/users/silkentrance/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/silkentrance/subscriptions","organizations_url":"https://api.github.com/users/silkentrance/orgs","repos_url":"https://api.github.com/users/silkentrance/repos","events_url":"https://api.github.com/users/silkentrance/events{/privacy}","received_events_url":"https://api.github.com/users/silkentrance/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-01-28T16:11:55Z","updated_at":"2015-08-12T18:08:52Z","closed_at":"2015-08-12T18:08:51Z","body":"@indexzero \r\n\r\nWhen merging the pull request for fixing isolate to also support coffee script you also included some redundant commits I did make and which have now been merged to master.\r\n\r\nHow about getting rid of the following commits:\r\n\r\n6652a90f699753073979c295a4d4da6e59cbd9cd\r\n6fc9a3aca99a36549a6961035aca9280c9793578\r\n262512586fda3c8b9ab3b946e172e57a74e92363\r\n\r\nThese commits contain unrelated commit messages as well as dummy changes that were made to retrigger travis builds that were failing at that time.\r\n\r\nSorry for that bogus PR.\r\n\r\n\r\nHere is a provable solution for getting rid of these commits.\r\n\r\n```\r\n> git rebase -i 4b8362ec38d40937b50b56eafb6f01176d578401^\r\n```\r\n\r\nin the editor you will then have to delete the following lines\r\n\r\n```\r\npick 6652a90 - felt free to add myself to the list contributors in order to restart the fric$\r\npick 6fc9a3a - previous build failed due to npm being unable to resolve existing packages, t$\r\npick 2625125 Update package.json\r\n```\r\n\r\nAnd finally you simply git push -f master to get rid of these commits once and for all.\r\n\r\nOf course, this will leave existing clones to be out of sync and may require the owners of these clones to fix their repositories as well.\r\n\r\nIn fact, I just tried with my own clone, I did also need to push -f master.\r\n\r\nWill now try with a fresh clone of vows and pulling the changes from my clone.\r\n\r\nNow, this being done leaves the unwanted commits in my own clone but it will merge just fine. Perhaps the other users need to recreate their clones... *sigh*, or fix them using the above steps as well."}}