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. 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. I usually do: pull <change stuff> pull stage my changes for commit (add) commit push but that only works because 99% of the time no one's changed the same stuff I changed. 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 http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
