# select upstream changes
git checkout --theirs .
# select local changes
git checkout --ours .

git add .
git commit -m "Merged using 'theirs' strategy"