This is where I get uneasy because I have messed up too many merge attempts (never tried with Leo outlines). Those merge tools can be so confusing as to what is going to happen!
On Saturday, December 12, 2020 at 10:06:53 AM UTC-5 Edward K. Ream wrote: > ... 2. Because of conflict markers, leojs.leo may be corrupted while > resolving merge conflicts. It's not a big deal. Git creates temp files > containing the (uncorrupted) before/after versions of the .leo file. -- 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/3af56e29-9b63-4c84-97f2-fd9b3c15ac27n%40googlegroups.com.
