Skip to content

Instantly share code, notes, and snippets.

@lmmendes

lmmendes/make_y_branch_into_master.sh

Created February 23, 2016 12:41
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save lmmendes/214551fe02645200ffd9 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save lmmendes/214551fe02645200ffd9 to your computer and use it in GitHub Desktop.
Download ZIP
Change the current branch to master in git
Raw
make_y_branch_into_master.sh
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment