Created
June 18, 2009 16:23
-
-
Save ptrv/131986 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# create and check out a temporary branch at the location of the bad merge | |
git checkout -b tmpfix <sha1-of-merge> | |
# remove the incorrectly added file | |
git rm somefile.orig | |
# commit the amended merge | |
git commit --amend | |
# go back to the master branch | |
git checkout master | |
# replant the master branch onto the corrected merge | |
git rebase tmpfix | |
# delete the temporary branch | |
git branch -d tmpfix |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment