Git Merge Recursive Ours - 命令语法示例

Question

使用递归策略进行git合并的正确格式是什么？(不要与git合并我们的策略混淆)

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