Skip to content

Instantly share code, notes, and snippets.

@troyericg
Created October 16, 2014 16:08
Show Gist options
  • Save troyericg/93e32e6ff0d307f98815 to your computer and use it in GitHub Desktop.
Save troyericg/93e32e6ff0d307f98815 to your computer and use it in GitHub Desktop.
(Because I always forget) How to overwrite a master branch with a remote branch
git checkout better_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge better_branch # fast-forward master up to the merge
----------------------
If you want your history to be a little clearer, I'd recommend adding some information to the merge commit message to make it clear what you've done. Change the second line to:
git merge --strategy=ours --no-commit master
git commit # add information to the template merge message
----------------------
# From this SO answer: http://stackoverflow.com/questions/2763006/change-the-current-branch-to-master-in-git
@xRyul
Copy link

xRyul commented Apr 1, 2022

This helped me too! Many thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment