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
# With git log check which commit is one prior the merge. Then you can reset it using: | |
git reset --hard commit_sha | |
# There's also another way | |
git reset --hard HEAD~5 | |
# will get you back 5 commits. | |
# Assuming your local master was not ahead of origin/master, you should be able to do | |
git reset --hard origin/master |
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
# fetch from the default remote, origin | |
git fetch | |
# reset your current branch (master) to origin's master | |
git reset --hard origin/master | |
### Ours Merging Method | |
# fetch from the default remote, origin | |
git fetch | |
# create a branch at your current master |