Simply accepting all incoming changes: git checkout --theirs <file>

Accepting all local changes: --ours instead of theirs