On Sun, 4 Mar 2018 14:36:04 -0800 (PST) vitalije <[email protected]> wrote:
> 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 Hi Vitalije, I forget whether the rather protracted discussions about commit_timestamp.json were before or after your joining us, but the goal was to have a unique identifier for a commit, without requiring a user to use git. I don't think it's reasonable to require non-coders to use git to get current Leo, e.g. for Leo with an attempted fix for a bug the user might have reported, where precise commit ID is important. I do kind of expect them to be able to use zip, as in https://github.com/leo-editor/leo-editor/archive/devel.zip but that doesn't include a git commit hash. So that's what the Leo build timestamp solution was supposed to solve. I usually fix the conflict it creates with git checkout --theirs leo/core/commit_timestamp.json but I *think* you can also add leo/core/commit_timestamp.json merge=ours to .gitattributes, but maybe you also need to do git config --global merge.ours.driver true for that to work, not clear to me. 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 https://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
