git theirs

Checkout their version of a file and add it

Git alias:

theirs = !"f() { git checkout --theirs $@ && git add $@; }; f"

Example:

git theirs

Compare: