Difference between revisions of "Git"
From Wiki
| Line 10: | Line 10: | ||
git push | git push | ||
</pre> | </pre> | ||
| + | |||
| + | See also: http://stackoverflow.com/questions/1407638/git-merge-removing-files-i-want-to-keep | ||
Revision as of 22:00, 19 October 2015
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
