> I guess that "no-overwrite" can be achieved by > > git merge -s ours --no-commit no it doesn't. which is why I called it a bad name. no-overwrite would still add new lines to the file not in ours (and no-commit isn't needed in that case) it just wouldn't overwrite conflicting lines, my understanding of ours is that it will keep the files as is. 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
