git merge strategy:

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.

git abort merge:

Since your pull was unsuccessful then just HEAD is the last “valid” commit on your branch (not HEAD^):

git reset –hard HEAD
The other piece you want is to let their changes over-ride your changes.

Older versions of git allowed you to use the “theirs” merge strategy:

git pull –strategy=theirs remote_branch
But this has since been removed, as explained in this message by Junio Hamano (the Git maintainer). As noted in the link, instead you would do this:

git fetch origin
git reset –hard origin

Advertisements