overite the whole branch to the other code example
Example: how to overwrite a branch to other branch
git checkout seotweaks
git merge -s ours master
git checkout master
git merge seotweaks
git checkout seotweaks
git merge -s ours master
git checkout master
git merge seotweaks