gt;
> --
> *From:* Edward K. Ream <edream...@gmail.com>
> *To:* leo-editor <leo-editor@googlegroups.com>
> *Sent:* Tuesday, January 31, 2017 7:25 AM
> *Subject:* Is there a way to avoid conflicts with commit_timestamp.json?
>
&g
On Tuesday, January 31, 2017 at 12:29:22 PM UTC-6, Terry Brown wrote:
>
> The best way, although I think it requires action per clone of the repo.,
> is to add
>
> commit_timestamp.json merge=ours
>
>
> in the .gitattributes file in
ll getting conflicts, maybe the
path's wrong, i.e. it should be leo/core/commit_timestamp.json merge=ours
perhaps.
Cheers -Terry
From: Edward K. Ream <edream...@gmail.com>
To: leo-editor <leo-editor@googlegroups.com>
Sent: Tuesday, January 31, 2017 7:25 AM
Subject: Is there a
We've discussed this at length in other threads. I seem to recall that
Terry said that there was a clever fix for this. Something better than
`git checkout --ours leo/core/commit_timestamp.json`. But maybe I'm
mis-remembering.
Now that I'm using branches, I suspect the way to merge the
