Friday, November 9, 2018

Git - Overwrite Master to different branch
git checkout feature_branch
git merge -s ours --no-commit master
git commit      # Add a message regarding the replacement that you just did
git checkout master
git merge feature_branch
Master was behind by several versions
and bring it up-to date