From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Fri, 17 Oct 2008 09:35:30 GMT
Subject: Re: commiting while the current version is in conflict
Message-ID: <2d460de70810170235q1c9211c3r1f56067e694b1ac@mail.gmail.com>
In-Reply-To: <m3d4hzk2du.fsf@localhost.localdomain>

On Fri, Oct 17, 2008 at 11:16, Jakub Narebski <jnareb@gmail.com> wrote:

> From time to time somebody proposes to add a command which is used
> only to say that given conflict got resolved, i.e. yet another
> porcelain "around" git-update-index plumbing (in addition to git-add,
> git-mv and git-rm).  One of problems is how to call it: git-resolve,
> git-resolved, git-mark-resolved?

In that case, you would still need a pre-add hook.
The problem is not that people can't mark resolved without adding.
It's that they can't add without checking (automatically) if there
are no conflicts.


Richard