git log 查看commit记录， 找到远端本地冲突之前的commit

git reset --soft [commitID]

git pull

完事

更多推荐

【问题处理】Merge made by the ‘ort‘ strategy.