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

Revisions

  1. ranieribt renamed this gist Jul 8, 2017. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.txt → git-merge-better_branch.txt
    View file
    File renamed without changes.
  2. ranieribt created this gist Jul 8, 2017.
    4 changes: 4 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,4 @@
    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