Skip to content

Instantly share code, notes, and snippets.

@skyjia

skyjia/git-overwrite-branch.sh

Forked from ummahusla/git-overwrite-branch.sh
Created July 21, 2021 08:10
Show Gist options
  • Save skyjia/cd1ec93d4bb692f1035eaeaedfaa5cf7 to your computer and use it in GitHub Desktop.
Save skyjia/cd1ec93d4bb692f1035eaeaedfaa5cf7 to your computer and use it in GitHub Desktop.
Download ZIP
Git overwrite branch with another branch
Raw
git-overwrite-branch.sh
# 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