On Wed, Nov 5, 2014 at 9:35 AM, 'Terry Brown' via leo-editor < [email protected]> wrote:
> Small observation, if you're working on something in a separate branch > and want to merge master into that branch periodically: > > git merge master > git commit -n > > will skip the hooks that fiddle with leo/core/commit_timestamp.json, > which saves dealing with unimportant conflicts in your branch. > ​Thanks for the tip. As you know, I like to work in the "trunk" so that I can test changes immediately, but perhaps I should use branches from time to time ;-) 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.
