It seems according to your log that the conflict is caused by leo/core/commit_timestamp.json
Try git checkout --force leo/core/commit_timestamp.json # then git pull devel to discard your changes to this file. It will be changed automatically when you commit next time. Vitalije -- 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.
