From: Miklos Vajna <vmiklos@frugalware.org>
Date: Thu, 16 Oct 2008 22:48:08 GMT
Subject: Re: commiting while the current version is in conflict
Message-ID: <20081016224808.GO536@genesis.frugalware.org>
In-Reply-To: <2d460de70810161510ha220593g4615a55b2c3e3b25@mail.gmail.com>

On Fri, Oct 17, 2008 at 12:10:55AM +0200, Richard Hartmann <richih.mailinglist@gmail.com> 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.