> On 10 Dec 2015, at 07:57, FLORENT Philippe <[email protected]> > wrote: > > 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
It’s not an old version that you don’t care about, it’s the highest version before your two merge versions started to diverge. It’s completely essential to do correct merges. Without it you wouldn’t be able to tell if something is a feature in one version which has been reimplemented in the other, or if it’s two entirely separate features. > Would be easier to see what’s going on with only 2 windows I think you’ll find very few people who would agree on that. For one, automatic merges (which Mercurial and TortoiseHg try to do) are *impossible* without knowing the base. > 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 You’ve probably been using Mercurial wrong if that has happened… normally, that old version would be in the base as well, and it would be easy to merge. If you’ve been moving code around between branches, without proper merging, it can happen. Fortunately, kdiff3 has plenty of tools to easily resolve this. For instance, if you *know* that your entire file is correct, and it’s in window 2, say, you can just pick “select 2 everywhere” (there is a even a keyboard shootout for it). > And finaly some functions were defined twice, terrible merge experience that > time I’m sorry to say, but you probably need to learn how to merge better. Like any powerful tool, kdiff3 can of course be used to mess up the code, since you essentially have completely freedom over the merge. /Sune
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
