Instructions on merging maintenance branches about matplotlib HOT 5 CLOSED

I find this relatively easy to do with git. Any time a pull request is filed, as part of the review we should consider whether it is being applied to the right branch. After merging into the maintenance branch, I think we should merge the maintenance branch into master at the same time.

from matplotlib.

Right, but I think Mike's point is that gitwash needs to include explicit instructions on how to do this. Gitwash seems to have concentrated on procedure for people submitting pull requests; it is incomplete with respect to exactly how those doing the pushing into the official repo should handle the requests, or any other push situations.

For example, in the case of a change made to the maintenance branch, there are three basic cases: 1) it can be merged to master with no changes; 2) it can be merged with some adjustments; 3) it should not be merged at all, perhaps because master has been changed in such a way as to make the maintenance change irrelevant or inappropriate.

from matplotlib.

Even in case 3) the merge should be made, with --strategy=ours so that the commit is shown as an ancestor of master. Otherwise a later merge would try to apply the commit.

from matplotlib.

"Even in case 3) the merge should be made, with --strategy=ours so that the commit is shown as an ancestor of master. Otherwise a later merge would try to apply the commit."

This is valuable information that should be in the docs. I don't think I would have thought of that otherwise.

from matplotlib.

I think the gitwash instructions are now in much better shape than they once were. Closing this bug.

from matplotlib.