On Tue, 16 Sep 2014 16:43:47 +0000, Assuied, Milan wrote: > I am used to merge using beyond a compare. > > Those days, I have to perform a very complex merge and I am stucked with > a feature that is extremely annoying: > > When I have a conflict, I ask Tortoise to take the "other" file and keep > the original in a .orig file, the .orig is added with <<<<<<< local and > >>>>>>> other, but more than this, the other part is merged into the > original one ! > > The two parts are then unaligned and it's impossible to guarantee that the > merge is OK because you have to review it line by line with no help from > the comparison tool. (see screen below): > > http://s13.postimg.org/yor6gno47/Untitled.jpg > > I want to disable this feature, but so far, I am unable to do it.
Set Settings->TortoiseHg->Auto-resolve merges = False to disable the simple merge algorithm. It can also be switched by "Automatically resolve merge conflicts where possible" checkbox. Regards, ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
