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! >
#1781 <https://github.com/leo-editor/leo-editor/issues/1781> Is the corresponding issue. I'll do it during the sabbatical as part of the collaboration on leojs. 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/55e97646-d8c7-4f2a-b847-1821400ba734n%40googlegroups.com.
