Git

From Wiki
Revision as of 21:58, 19 October 2015 by Admin (Talk | contribs) (Created page with 'Undo bad merge: <pre> git clone <repo> git checkout <commit_id> git checkout HEAD@{1} . git merge --no-commit master git revert <commit_id> git checkout master test.txt git add …')

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

Undo bad merge:

git clone <repo>
git checkout <commit_id>
git checkout HEAD@{1} .
git merge --no-commit master
git revert <commit_id>
git checkout master test.txt
git add test.txt
git commit