d8bit
9/22/2016 - 9:12 AM

Set a branch as master branch

Set a branch as master branch

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