Re: commiting while the current version is in conflict

On Fri, Oct 17, 2008 at 01:00, Shawn O. Pearce [off-list ref] wrote:

The sample pre-commit hook checks for these.  Its really hande to
have enabled.

Thanks.

and merge conflicts are "resolved" by you running "git add $path"
after you have finished fixing that path.

True, git add is an implicit resolving, I did not think about it this way.
Personally, I think that git should break at this point, but that's
just me.

The obvious fix would be a pre-add hook. Does anyone else think
this would make sense?


Judging from the code in the pre-commit script, git does not
keep conflict information in its metadata cache, but tries to guess
conflicts from the file's contents/ This seems to be a strange
thing to do, imo. What's the reason for this?


Richard