From: SZEDER Gábor <szeder@ira.uka.de>
Date: Thu, 02 Oct 2008 14:25:03 GMT
Subject: Re: update-index --unresolve
Message-ID: <20081002142503.GE6839@neumann>
In-Reply-To: <20081002141853.GD6839@neumann>

On Thu, Oct 02, 2008 at 04:18:53PM +0200, SZEDER Gábor wrote:
> > > How could I clear those states by accident (or intentionally)?
> > 
> > "git add <file>", or "git update-index <file>", or error in handling
> > merge tool via git-mergetool.
> Thanks for your fast reply.
> 
> However:
> 
> # ...  do a conflicting merge
> (master|MERGING)$ echo 4 >one
> (master|MERGING)$ git status
> one: needs merge
> # On branch master
> # Changed but not updated:
> #   (use "git add <file>..." to update what will be committed)
> #   (use "git checkout -- <file>..." to discard changes in working
> #   directory)
> #
> #       unmerged:   one
> #
> no changes added to commit (use "git add" and/or "git commit -a")
> (master|MERGING)$ git add one
> (master|MERGING)$ git status
> # On branch master
> # Changes to be committed:
> #   (use "git reset HEAD <file>..." to unstage)
> #
> #       modified:   one
> #
> (master|MERGING)$ git update-index --unresolve

Ah, that should be 'git update-index --unresolve one', and
everything works as expected.


Sorry,
Gábor