* manual merge/fixup question
@ 2006-01-07 16:55 Luben Tuikov
2006-01-07 17:01 ` Luben Tuikov
0 siblings, 1 reply; 2+ messages in thread
From: Luben Tuikov @ 2006-01-07 16:55 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: manual merge/fixup question
2006-01-07 16:55 manual merge/fixup question Luben Tuikov
@ 2006-01-07 17:01 ` Luben Tuikov
0 siblings, 0 replies; 2+ messages in thread
From: Luben Tuikov @ 2006-01-07 17:01 UTC (permalink / raw)
To: git
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-07 17:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-07 16:55 manual merge/fixup question Luben Tuikov
2006-01-07 17:01 ` Luben Tuikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).