Skip to content

Instantly share code, notes, and snippets.

@ranieribt

ranieribt/git-merge-better_branch.txt

Created July 8, 2017 21:45
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save ranieribt/685ffe02a77de92c1037df33e95945c2 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save ranieribt/685ffe02a77de92c1037df33e95945c2 to your computer and use it in GitHub Desktop.
Download ZIP
Make the current git branch a master branch
Raw
git-merge-better_branch.txt
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
@ranieribt
Copy link
Author

ranieribt commented Jul 8, 2017

based on https://stackoverflow.com/a/2763118/938261

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