On Saturday, December 12, 2020 at 7:09:52 AM UTC-6 Edward K. Ream wrote: *Aha 1*: The key to collaborating with Leo is merging .leo files! > *Aha 2: *Leonistas need a way to resolve merge conflicts in.leo files! > *Aha 3:* git-diff provides the infrastructure to resolve such merge > conflicts! >
Recent experience with the leojs project has clarified matters. I have just updated #1781 <https://github.com/leo-editor/leo-editor/issues/1781>: Leo's git-diff command and diff-pr script should support diffing .leo files. This *might* suffice. For sure we want Leonine diffs of .leo files in PR's. 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 view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/28cf19d2-f86a-4bf1-b1b2-ee1da2104c2an%40googlegroups.com.
