# update-index --unresolve

4 messages from 2008-10-02 to 2008-10-02. Participants: SZEDER Gábor, Jakub Narebski.
Thread: https://gitlist.dev/t/15755

## SZEDER Gábor, 2008-10-02 13:52

Subject: update-index --unresolve
Message-ID: <20081002135224.GC6839@neumann>
URL: https://gitlist.dev/e/20081002135224.GC6839%40neumann

```
Dear All,

the documentation says following:

  --unresolve::
         Restores the 'unmerged' or 'needs updating' state of a
         file during a merge if it was cleared by accident.

How could I clear those states by accident (or intentionally)?

Thanks,
Gábor

```

## Jakub Narebski, 2008-10-02 13:58

Subject: Re: update-index --unresolve
Message-ID: <m3tzbvqesz.fsf@localhost.localdomain>
URL: https://gitlist.dev/e/m3tzbvqesz.fsf%40localhost.localdomain
In-Reply-To: <20081002135224.GC6839@neumann>

```
SZEDER Gábor <szeder@ira.uka.de> writes:

> Dear All,
> 
> the documentation says following:
> 
>   --unresolve::
>          Restores the 'unmerged' or 'needs updating' state of a
>          file during a merge if it was cleared by accident.
> 
> 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.

-- 
Jakub Narebski
Poland
ShadeHawk on #git

```

## SZEDER Gábor, 2008-10-02 14:18

Subject: Re: update-index --unresolve
Message-ID: <20081002141853.GD6839@neumann>
URL: https://gitlist.dev/e/20081002141853.GD6839%40neumann
In-Reply-To: <m3tzbvqesz.fsf@localhost.localdomain>

```
Hi Jakub,

On Thu, Oct 02, 2008 at 06:58:41AM -0700, Jakub Narebski wrote:
> SZEDER Gábor <szeder@ira.uka.de> writes:
> >   --unresolve::
> >          Restores the 'unmerged' or 'needs updating' state of a
> >          file during a merge if it was cleared by accident.
> > 
> > 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
(master|MERGING)$ echo $?
0
(master|MERGING)$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   one
#

So, as you can see, after 'add ; update-index --unresolve' the file is
not marked as unmerged, but it's still ready to be committed.

Is something wrong going on here, or it is indeed the intended
behaviour and I misunderstood this functionality?

Thanks,
Gábor

```

## SZEDER Gábor, 2008-10-02 14:25

Subject: Re: update-index --unresolve
Message-ID: <20081002142503.GE6839@neumann>
URL: https://gitlist.dev/e/20081002142503.GE6839%40neumann
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

```