marcosvidolin
7/14/2016 - 6:03 PM

replace master with branch

replace master with branch

You should be able to use the "ours" merge strategy to overwrite master with seotweaks like this:

git checkout seotweaks
git merge -s ours master
git checkout master
git merge seotweaks

The result should be your master is now essentially seotweaks.