[Python-Dev] [python-committers] How are we merging forward from the Bitbucket 3.5 repo?

Nathaniel Smith njs at pobox.com
Mon Aug 17 04:58:54 CEST 2015

On Sun, Aug 16, 2015 at 7:08 AM, Guido van Rossum <guido at python.org> wrote:
> (I'm only familiar with the GitHub PR flow, and I don't like its behavior,
> which seems to always create an extra merge revision for what I consider as
> logically a single commit.)

For whatever it's worth, this is a "feature": the extra merge revision
serves as a record of the fact that a PR was merged, who merged it,
and what the state of the branch was before and after the merge
(useful in case the PR contains multiple revisions that are all
getting merged together). These are all things that git makes
impossible to reconstruct after the fact otherwise, because it stores
no metadata about which branch each revision started out in. But if
you consistently make a merge commit every time, then 'git log
--first-parent' will reliably show one entry per merged PR.


Nathaniel J. Smith -- http://vorpus.org

More information about the Python-Dev mailing list