Skip to content

Instantly share code, notes, and snippets.

@dpossas
Forked from mmeinhart/git-discard-commits
Created October 23, 2018 13:04
Show Gist options
  • Save dpossas/13bc10e71b9b2e19fd6b087bb87d74b2 to your computer and use it in GitHub Desktop.
Save dpossas/13bc10e71b9b2e19fd6b087bb87d74b2 to your computer and use it in GitHub Desktop.
Git: Discard Local Commits
# 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
git branch old-master
# reset to origin's master
git reset --hard origin/master
# merge your old master, keeping "our" (origin/master's) content
git merge -s ours old-master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment