问题
How can I simply (e.g. in one command?) merge in Git, keeping the state of conflicting files as in the current branch and without specifying each file individually as in theirs/ours options?
git checkout master
git merge stable --some-option-to-keep-files-?
回答1:
The merge strategy has an "ours" option which is what you want
git merge -s recursive -X ours remote/branch
As the manpage stresses out, this is NOT git merge -s ours.
来源：https://stackoverflow.com/questions/12572530/can-i-merge-only-non-conflicting-changes-in-git