From: Caleb Cushing Date: Sat, 29 Nov 2008 16:48:45 GMT Subject: more merge strategies : feature request Message-ID: <81bfc67a0811290848m6cb219c0y71a7266001096f2d@mail.gmail.com> 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) -- Caleb Cushing