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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
