New 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, 9 Apr 2009 18:07:07 +0200: Description: == Merge conflicts == There are two problems with the way merge handles conflicts: 1. conflicts must currently be solved on the spot 2. it is not clear where the conflicts are. == Solution == I think TortoiseSVN does a good job at it, by mangling the conflicted files with >>>>>>>>>>> and by creating the BASE OTHER and THIS files. This also provides an easy way to queue the conflict resolution and use other tools than Kdiff3 (which I consider terrible). Responsible: tortoisehg -- 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. ------------------------------------------------------------------------------ This SF.net email is sponsored by: High Quality Requirements in a Collaborative Environment. Download a free trial of Rational Requirements Composer Now! http://p.sf.net/sfu/www-ibm-com _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
