Promote alternate git branch to master branch

strategic_merge.sh

# We actually don't need to do that.
# Even if the branches are very different and you don't wanto resolve a ton of conflicts.
# Using the strategy argument in the merge command, you can instruct git to just use
# tha state in the current branch and do the merge, preserving all the history.
git checkout alternate_branch
git merge --strategy=ours master # keep the content of this branch, but record a merge
git checkout master
git merge alternate_branch       # fast-forward master up to the merge
# Now you can delete the alternate_branch and go back to using master.