Re: more merge strategies : feature request

On 12/1/08, Andreas Ericsson [off-list ref] wrote:

Caleb Cushing wrote:

quoted

conflict: this strategy would always resolve in a merge conflict
allowing you to use git mergetool to piece the files back together.

no-overwrite: if a change from the branch being merged in would
overwrite something in the current branch don't merge it. (I think it
needs a better name)

I guess that "no-overwrite" can be achieved by

git merge -s ours --no-commit

--Leo--