Just my 2 cents worth: you can't merge sqlite databases easily - git does not know how to do that. However, most of the time merging XML files will just do the right thing, and if not, you can look at the human readable diff to figure out what went wrong.
- Josef -- 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 https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
