Resolve merge conflicts on pull using my changes

Use the recursive merge strategy with the ours option:

git merge -s recursive -X ours branch_to_merge

or

git pull -s recursive -X ours

For any conflicts, it will use the hunk that comes from your branch. See the git merge man page for more details.