_Bits with anxiety disorder

About RSS
Dec 18, 2013 | #planet-fosswomen ##git ##rails ##ror ##ruby #planet-fosswomen #Programming

How to revert a faulty merge [Git]

These links helped me to revert a faulty merge already pushed to the remote repository:

  • http://christoph.ruegg.name/blog/git-howto-revert-a-commit-already-pushed-to-a-remote-reposit.html
  • https://code.google.com/p/git-core/source/browse/Documentation/howto/revert-a-faulty-merge.txt
  • http://git-scm.com/blog/2010/03/02/undoing-merges.html

And git revert -m 1 commit-hash won't run if there are unmerged files in your repo.