views:

74

answers:

1

What is the right format for a git merge with a strategy of recursive 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
...

Thanks!

A: 

git merge -s recursive -X ours foo

Gabe Moothart
thanks lol. will try this.
Quang