How to replace master branch in git, entirely, from another branch?
Published on 6 October 2014 at 10:00 by
If you want to completely replace a branch by merging over another, the follow trick will help you, as it has helped me:
git checkout yourbranch
git merge -s ours master
git checkout master
git merge yourbranch