"Constantine Plotnikov" <constantine.plotnikov@xxxxxxxxx> writes: > I think that if git merge reports the conflicts, such conflicts should > be discoverable using git ls-files and prevent commit with resolving > the conflict like it is done with modify-delete conflicts. Yeah, I think so, too. -- 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
