Skip to content

Instantly share code, notes, and snippets.

@ummahusla

ummahusla/git-overwrite-branch.sh

Forked from brev/git-overwrite-branch.sh
Last active September 5, 2024 13:48
Show Gist options
  • Save ummahusla/8ccfdae6fbbe50171d77 to your computer and use it in GitHub Desktop.
Save ummahusla/8ccfdae6fbbe50171d77 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
@mikkebjo
Copy link

mikkebjo commented Feb 3, 2023

Thank you, this was perfect :)

@nicolaswendling
Copy link

Approved, that works! Thanks

@socketbox
Copy link

That still leaves non-conflicting stuff in master. Say i deleted shit in seotweaks but master still has them, the merge will let master keep it because it doesn't conflict, it's just master "adding" things.

git checkout -B master anotherbranch
See https://stackoverflow.com/a/29871400/148680

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