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. For a project like Leo, for
the git log viewing tools I'm aware of, I don't really see that this
matters, it's unnecessary, but not the end of the world some people
seem to think.
However, it seems like it's really easy to avoid, so if I remember,
I'll be using `git pull --rebase` rather than just `git pull` in the
following common merge commit creating scenario.
start with clean copy of github master
do some stuff
git commit
git push
fails - someone else has pushed since
git pull
git commit
creates merge commit
git push
all sync'ed again
I guess all it takes is `git pull --rebase` rather than just `git pull`
in the above to have git "remove" your new commits from your local
master, and then re-apply them on the end of the shared timeline
without the merge commit being required.
Seems to me that creating merge commits intentionally is fine, and for
Leo at least, creating them accidentally is harmless, but when they're
just clutter and so easily avoided, I'll try to avoid them.
Info. from:
randyfay.com/content/simpler-rebasing-avoiding-unintentional-merge-commits
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.
