On Tue, Apr 14, 2015 at 8:18 AM, 'Terry Brown' via leo-editor < [email protected]> wrote:
On Mon, 13 Apr 2015 15:32:46 -0700 (PDT) > "Edward K. Ream" <[email protected]> wrote: > > > There is a clever something or other that allows us to commit > > commit_timestamp.json without causing conflicts, but I forget what it > > was. Can somebody remind me? > > I'm not sure - I found something about how to avoid > leo/core/commit_timestamp.json processing when you're working on a > branch, but I don't think that's what you're looking for. > Yeah, I found that too. I don't think it helps. > > I ran into conflicts (just in commit_timestamp.json) when I pulled > 657d432de this morning. I don't think that should have happened - oh > wait, I did gave one commit I'd forgotten to push, so that was self > inflicted on my part. > > So I *think* conflicts in commit_timestamp.json are inevitable if you > commit before pulling and there's a commit you don't have on github. > Hmm. What I want is for commits to always update the .json file, but for pulls to overwrite it silently. Surely this should be possible. Edward -- 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 http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
