# manual merge/fixup question

2 messages from 2006-01-07 to 2006-01-07. Participants: Luben Tuikov.
Thread: https://gitlist.dev/t/2989

## Luben Tuikov, 2006-01-07 16:55

Subject: manual merge/fixup question
Message-ID: <20060107165506.67640.qmail@web31812.mail.mud.yahoo.com>
URL: https://gitlist.dev/e/20060107165506.67640.qmail%40web31812.mail.mud.yahoo.com

```
git resolve or git merge fails, complaining
about file(s) having conflicts. I go ahead and fix up
those files and then update the index.

Can I assume now that I can go ahead and do git commit,
or is there any more/other files which need fixing?

I.e. does git resolve/merge fail on the first file
which needs fixing or would it go through all of them,
and then report the ones which need fixing?

Thanks,
   Luben

```

## Luben Tuikov, 2006-01-07 17:01

Subject: Re: manual merge/fixup question
Message-ID: <20060107170132.66682.qmail@web31803.mail.mud.yahoo.com>
URL: https://gitlist.dev/e/20060107170132.66682.qmail%40web31803.mail.mud.yahoo.com
In-Reply-To: <20060107165506.67640.qmail@web31812.mail.mud.yahoo.com>

```
Ok, I think it does all of them...
    Luben

--- Luben Tuikov <ltuikov@yahoo.com> wrote:

> git resolve or git merge fails, complaining
> about file(s) having conflicts. I go ahead and fix up
> those files and then update the index.
> 
> Can I assume now that I can go ahead and do git commit,
> or is there any more/other files which need fixing?
> 
> I.e. does git resolve/merge fail on the first file
> which needs fixing or would it go through all of them,
> and then report the ones which need fixing?
> 
> Thanks,
>    Luben
> 
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

```