Issue 159: Merge should actively garble all conflicted files, and allow the user to resolve later http://bitbucket.org/tortoisehg/stable/issue/159/merge-should-actively-garble-all-conflicted-files-and-allow-the-user-to-resolve
rares on Thu, 14 May 2009 17:12:32 +0200: Comment: Hello, Thanks for taking care of it, however I consider the current implementation as only partially usable. The reason is that the reference files for common base and the other branch are missing and will need to be hunted by the user who does the merge. Each conflict should ideally generate 4 files: * MyFile.c (garbled) * MyFile.c.BASE (common base of both files which are merged) * MyFile.c.THIS (local file before merging) * MyFile.c.OTHER For complicated merges, this setup allows the user to quickly compare THIS with BASE and OTHER with BASE, rename the one with the most changes as MyFile.c, then manually insert the changes from the other pair. Obs: this is how TortoiseSVN and Bazaar handle a conflict. Changes: status: resolved -> open component: settings -> merge version: 0.7 -> crew -- This is an issue notification from bitbucket.org. You are receiving this either because you are the owner of the issue, or you are following the issue. ------------------------------------------------------------------------------ The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your production scanning environment may not be a perfect world - but thanks to Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700 Series Scanner you'll get full speed at 300 dpi even with all image processing features enabled. http://p.sf.net/sfu/kodak-com _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
