Skip to content

Instantly share code, notes, and snippets.

@brev

brev/git-overwrite-branch.sh

Created May 14, 2015 21:27
Show Gist options
  • Star 14 You must be signed in to star a gist
  • Fork 4 You must be signed in to fork a gist
  • Save brev/c67a509af263d45d61b8 to your computer and use it in GitHub Desktop.
Save brev/c67a509af263d45d61b8 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 seotweaks branch (seotweaks > master)
git checkout seotweaks # source name
git merge -s ours master # target name
git checkout master # target name
git merge seotweaks # source name
@michaellee
Copy link

I'm unfamiliar with -s ours but was wondering if you're overwriting master with the contents of seotweaks branch, why does a merge into seotweaks occur first?

@smaier
Copy link

smaier commented Oct 10, 2016

correction: git merge -s ours master --allow-unrelated-histories

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