Painful user experience with 'hg resolve'

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Fri, 2011-08-26 at 09:34 +0200, Martin Geisler wrote:
>> Matt Mackall <mpm at selenic.com> writes:
>> 
>> TortoiseHg now defaults to using intermal:merge when do you "hg
>> merge" and then lets you fix the merge at your own leisure
>> afterwards. That model makes a lot of sense to me.
>
> Are you telling me that TortoiseHG is sticking conflict markers in
> files by default now? If so, I frankly think that's tragic: it's
> always been my goal to avoid a user ever having to see those horrible
> things again.
>
> Using internal:fail would have deferred the file merges just as well.

Yes, sorry, they use internal:fail by default. Conflict markers or not
was not the point, my point was the two-step approach they use.

I'm mostly working on projects with few and simple merge conflicts, so I
don't have that much experience with complicated conflicts. Henrik and
Sune has said before that they regularly solve massive merge conflicts,
so I guess they have some advice too.

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://mercurial.aragost.com/kick-start/