On Sat, Jul 19, 2014 at 11:44 AM, 'Terry Brown' via leo-editor <[email protected]> wrote: > > We're getting > > Merge branch 'master' of github.com:leo-editor/leo-editor > > commits in the repo, in the master branch. I just made one, and > there's one from Edward a day or to back.
In my case, the problem arose from changing the commit message of an already-pushed commit. That's a no-no. From: http://git-scm.com/book/en/Git-Branching-Rebasing "If you rebase commits that have already been pushed publicly, and people may have based work on those commits, then you may be in for some frustrating trouble." 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.
