Last active
November 17, 2015 21:03
-
-
Save yulgit1/429f504b38e515d2725a to your computer and use it in GitHub Desktop.
undo commit and rebase
This file contains hidden or 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
git checkout extract-metadata2 | |
git reset --hard HEAD^ | |
git checkout master | |
git pull <upstream> master | |
git checkout extract-metadata2 | |
git rebase master | |
<fix conflicts> if any | |
git push --force <origin> | |
where | |
extract-metadata2 = topic branch | |
<upstream> = hydra-labs | |
<origin> = your github acct |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment