On Wed, Jan 20, 2010 at 10:55 PM, thyrsus <[email protected]> wrote: > 2. I suggest that variant versions of a clone get uncloned; it > would be useful to generate a warning.
Earlier, I suggested that leo employ some conservative heuristic about what version to keep. Such a thing would be, for example, that a source code file (.py, .cpp...) would always win the fight over node ownership. > I currently do A1; if I get a sabbatical I'll invent A2 (apparently > the commercial tool oXygen can resolve XML conflicts). Edward's > practice is currently B1. B2 might improve things. The problem isn't solved merely by running a conflict resolver tool. Version control systems just shove the conflict markers in the nodes, with no real regard for what the content is like. We'd need to hook to that resolution mechanism, and even if we could do it, configuring it would be way over most users heads. -- Ville M. Vainio http://tinyurl.com/vainio
-- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
