Git Merge Recursive Ours - Command Syntax Example
What is the right format for a git merge with a strategy of recu开发者_如何学Crsive ours? (not to be confused with the git merge ours strategy)
http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
I tried a bunch of ways and it doesn't seem to work.
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
...
git merge -s recursive -X ours foo
精彩评论