[Numpy-discussion] proposal: new commit guidelines for backportable bugfixes

[Pauli Virtanen]

19.07.2014 11:04, Ralf Gommers kirjoitti:
[clip]
>   1. bugfix PR sent to master by contributor
>   2. maintainer decides it's backportable, so after review he doesn't merge
> PR but rebases it and sends a second PR. First one, with review content, is
> closed not merged.
>   3. merge PR into maintenance branch.
>   4. send third PR to merge back or forward port the fix to master, and
> merge that.
> (or some variation with merge bases which is even more involved)

The maintainer can just rebase on merge base, and then merge and push it
via git as usual, without having to deal with Github. If the pull
request happens to be already based on an OK merge base, it can be
merged via Github directly to master.

The only thing maintainer gains from sending additional pull request via
Github is that the code gets run by Travis-CI. However, the tests will
also run automatically after pushing the merge commits, so test failures
can be caught (although after the fact). This is also the case for
directly pushed cherry-picked commits.

-- 
Pauli Virtanen