Git

From Wiki
Revision as of 22:00, 19 October 2015 by Admin (Talk | contribs)

Jump to: navigation, search

Undo bad merge:

git clone <repo>
git checkout <commit_id>
git merge --no-commit master
git revert <commit_id>
git add .
git commit
git push

See also: http://stackoverflow.com/questions/1407638/git-merge-removing-files-i-want-to-keep