Simulate merge -s theirs since git has removed this strategy

git-merge-theirs

#!/bin/sh

merge_branch=$1
test -z $merge_branch && echo "branch required." 1>&2 && exit 1

current_branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')

git checkout $merge_branch
git checkout -b tmp
git merge -s ours $current_branch
git checkout $current_branch
git merge tmp
git branch -D tmp