From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Thu, 16 Oct 2008 23:31:02 GMT
Subject: Re: commiting while the current version is in conflict
Message-ID: <2d460de70810161631n4b9f766fv2bca0e44d1e4009@mail.gmail.com>
In-Reply-To: <20081016232332.GD9877@spearce.org>

On Fri, Oct 17, 2008 at 01:23, Shawn O. Pearce <spearce@spearce.org> wrote:


> Yes, in the index.  But it erases it when you stage the file with
> "git add".
>
> Go look at my prior message about how "git commit -a" is staging
> the files prior to commit.  That makes git commit think everything
> has been resolved, because you've told git, everything is resolved.

This makes a good part of my latest email obsolete. Asynchronous
communication ftw ;)


Richard