On Tuesday, April 24, 2018 at 3:32:34 PM UTC-5, Edward K. Ream wrote: > 1. [New principle]: The *only *proper way to resolve clone conflicts is to give priority to clones within @<file> trees. Why did this principle never occur to me before?
> 3. [New principle]: When resolving a clone conflict, Leo *must* tell the user...what the resolution was. The worst, hardest case involves clone conflicts in two nodes, both of which are part of @<file> trees. Perhaps in this case only the "last clone wins" rule can apply. Happily, principle 3 will still apply. There is an over-arching requirement: when switching git branches, *we want to completely eliminate any surprises*. It would still be possible (though unlikely) for the clone resolution to change a outline such that rewriting the file would cause git to report a change. At present, such nasty surprises are all too common, and they happen without any warning at all. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
