more merge strategies : feature request
From: Caleb Cushing <hidden>
Date: 2016-06-15 22:45:42
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