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 versionsand bring it up-to date
Thoughts, comments, opinions of 20-something working in IT striving to be a house-proud homemaker