Out of curiosity, do other clients offer conflict resolution? In my experience, there is no single quick fix for conflicts — each case is different and requires human interaction to figure out which changes to use. (SVN 1.5 added interactive conflict resolution, but there is no way to automatically guess the right thing to do.)
- Quinn On Jun 1, 2009, at 6:22 AM, iVira wrote:
+1. Version such a great svn client in all other cases. But lack of conflicts resolving... I have to avoid revert my changes, update and add them again. It's such a headache On May 7, 7:15 pm, jcdesrochers <jcdesroch...@gmail.com> wrote:Just a quick question about Versions development road map.... do you plan in a near future to addmergesupport??? If so... any ETA?? I'm evaluating the svn clients for mac and themergefunctionality is a must for us. Thanks for answering. Regards, J-C--~--~---------~--~----~------------~-------~--~----~You received this message because you are subscribed to the Google Groups "Versions" group.To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~----------~----~----~----~------~----~------~--~---
smime.p7s
Description: S/MIME cryptographic signature
