Yep,the base file , sometimes it appears, sometimes not, but to me it is an old 
version that I don’t care and make things really painfull
Would be easier to see what’s going on with only 2 windows

Well the issue is that my collegue had an ancient version of my code
So when I merge with his modifications, instead of having my actual latest code 
clean, it is all messed up, so I ended up copy pasting my new code
And finaly some functions were defined twice, terrible merge experience that 
time

From: Benjamin Fritz [mailto:fritzophre...@gmail.com]
Sent: mercredi 9 décembre 2015 18:23
To: FLORENT Philippe
Cc: tortoisehg-discuss@lists.sourceforge.net
Subject: Re: [thg] alternative to tortoise merge tool


On Dec 9, 2015 7:49 AM, "FLORENT Philippe" 
<philippe.flor...@edenred.com<mailto:philippe.flor...@edenred.com>> wrote:
>
> Hello,
>
>
>
> Is there an alternative to tortoise built in merge tool ?
>
>

Are you talking about kdiff3? I'm pretty sure that's what TortoiseHg comes 
bundled with, these days. It's one of the best out there. But sure, there are 
alternatives. Search the web for "3-way merge tool".

>
> because it is a pain to use and even when I think it is ok, it duplicates 
> parts of the code
>
>

In the decade or so I've been using kdiff3, I've never had that problem. Can 
you give an example?

>
> I am looking for something clear to use and that don’t add an extra 3rd text 
> window that seems to come from nowhere
>

Um, do you mean the "base" file? As in, the common ancestor of the two versions 
of the file you're merging? That's kind of an essential part of doing easy 
merges in any revision control system, even SVN. Without it, automatic merges 
are not really possible.

> Also if it could display the different branch names that would allow users 
> not to try figure out which code belongs to who for 5 min
>
>
>

Yeah that would be useful, I'd be interested in that as well.
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-discuss mailing list
Tortoisehg-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to