On Fri, Oct 17, 2008 at 12:10:55AM +0200, Richard Hartmann <richih.mailinglist@xxxxxxxxx> wrote: > all changes were submitted. Of course, I now have a > file with the conflict markers inlined in my repository. Not > a good thing, imo. Is there a way to make git block all > conflicting versions? Write a pre-commit hook that checks for conflict markers? > Also, I would be interested in the design decissions > behind the current behaviour. Any pointers? Not sure, but in general blocking conflict markers by default would be a bad idea IMHO, several markup language (asciidoc, for example) makes use of the >>>, === and such character sequences.
Attachment:
pgpHodufBGkI2.pgp
Description: PGP signature
