Actualy I tested winmerge, wich is way more user friendly and avoids displaying 3 windows but the problem remains, my collegue and I have the same code for 80% of the file but the last bits get messed around, since the merging program is not function-block aware and we got no other choice than doing a copy paste in notepad++ cos it is way easier to read what’s going on like this
From: Benjamin Fritz [mailto:[email protected]] Sent: vendredi 11 décembre 2015 18:05 To: [email protected] Subject: Re: [thg] FW: FW: alternative to tortoise merge tool On Fri, Dec 11, 2015 at 3:35 AM, FLORENT Philippe <[email protected]<mailto:[email protected]>> wrote: > > No need to go wild here, I never said anything about « DELIBERATELY NOT USING > YOUR VERSION CONTROL” > > We still do commits and push, I said so far we don’t have time to f@#k around > with kdiff merges so I copy paste things manualy > What you said was "we send modifs by mail" which I had assumed meant that you're manually applying changes from one branch to another branch, and committing without doing a merge. If you really meant that you run a merge in Mercurial and then apply changes manually for every conflicted file rather than using kdiff3, then I guess I misunderstood and I retract my criticism. But if my assumption was correct, then you ARE deliberately not using your version control for merges, and Mercurial cannot know that a particular change has already been merged, because you didn't inform Mercurial of that fact. And no merge tool will help you with that.
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
