On Tue, 07 Jan 2014 14:37:17 -0500 Offray Vladimir Luna Cárdenas <[email protected]> wrote:
> which is a Leo notebook having all my research notes for my phD (and now > I'm unable to open it). Which, as you probably know, is because it has merge conflict markers in it? They would break JSON or YAML too. The VCS should let you undo the merge attempt. Yes, reading XML is unpleasant and best avoided, and YAML is easier to read, but Leo's file format isn't really intended to be human readable. If your content is in @auto or @file nodes in human readable formats like .txt and .rst, reading the merge conflicts wouldn't be too bad. Cheers -Terry -- 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 http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
