git - Git Merge Recursive Ours - 命令语法示例

Question

git merge 与我们的递归策略的正确格式是什么？（不要与 git merge ours 策略混淆）

http://www.kernel.org/pub/software/scm/git/docs/git-merge.html

我尝试了很多方法，但似乎不起作用。

git merge foo -s recursive-ours  // doesn't work
git merge foo -s recursive ours // doesn't work
git merge foo -s recursive -ours // doesn't work
...

Answer 1

git merge -s recursive -X ours foo