Git Pull Auto Rebase Accept Accept Incoming

git checkout --ours -- <paths>
# or
git checkout --theirs -- <paths>
DreamCoder