On Sat, Dec 12, 2020 at 10:59 AM [email protected] <[email protected]> wrote:
> 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! > Yes, things can get complicated, but that can't be helped. Git doesn't create the conflicts, collaboration does. The new git-pr command greatly clarifies the diffs in a pull request. Ditto for Leo's git diff command. Only time will tell how easy it will be to handle merge conflicts in .leo files. 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/CAMF8tS1R8f3zO-p52tsoqUcdjUR%3DaS8deQUJGyPNYkY5g7AvcA%40mail.gmail.com.
