Menu
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 ... 
534
Recursive is the default merge strategy when pulling or merging one branch. Additionally this can detect and handle merges involving renames, but currently cannot make use of detected copies. This is the default merge strategy when pulling or merging one branch.
You can use git merge-base --all to see the merge base candidate commits. Using -s resolve will pick one of them, while -s recursive will take all of them, merge them into a new commit, and use that new commit as the merge base.
The git merge command lets you take the independent lines of development created by git branch and integrate them into a single branch. Note that all of the commands presented below merge into the current branch.
To merge branches locally, use git checkout to switch to the branch you want to merge into. This branch is typically the main branch. Next, use git merge and specify the name of the other branch to bring into this branch. This example merges the jeff/feature1 branch into the main branch.
git merge -s recursive -X ours foo
78
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
