On Sunday, March 4, 2018 at 11:30:55 PM UTC+1, vitalije wrote: > > It seems according to your log that the conflict is caused > by leo/core/commit_timestamp.json > > > This made me think about. It is not first time that I had troubles with this file. Because it is automatically changed every time commit is executed, quite often it prevents merge. Perhaps with the new scheme of working on devel branch and just occasionally merging it to master, it may be good to skip updates to this file when in devel branch. That would reduce probability of code conflicts.
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.
