git merge with force code example
Example: git merge force
git checkout master
git merge -X theirs branchName
git push origin master --force # again, see below
git checkout master
git merge -X theirs branchName
git push origin master --force # again, see below