Skip to content

Instantly share code, notes, and snippets.

@strarsis
Forked from ummahusla/git-overwrite-branch.sh
Created August 15, 2024 21:12
Show Gist options
  • Save strarsis/69b1972e85b1fdfa394c26dc1b540f45 to your computer and use it in GitHub Desktop.
Save strarsis/69b1972e85b1fdfa394c26dc1b540f45 to your computer and use it in GitHub Desktop.
Git overwrite branch with another branch
# overwrite master with contents of feature branch (feature > master)
git checkout feature # source name
git merge -s ours master # target name
git checkout master # target name
git merge feature # source name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment