Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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
...
git merge -s recursive -X ours foo