Text of discourse.matplotlib.org › t › github-devel-question › 15103 as Styx crawled it on Nov 19, 2026. The page may have changed since. Only its words are kept, without pictures or layout, and only the first part of a long page.

Open the live page

github devel question - matplotlib-devel - Matplotlib

github devel question Development matplotlib-devel Benjamin_Root1 February 25, 2011, 6:45pm 1 Ok, I am still learning quite a bit about git, please bear with me. I am having difficulty completing a pull request that I opened. When I try to merge the changes to upstream, they get rejected. I can merge it back to my own master, and can even push it up to my github repo’s master, but not matplotlib’s master. After some investigation, I am left wondering if the cause might be that my branches were branched off of my (un-updated) master (which tracked my github’s master, not matplotlib’s master).

I have tried rebasing my branches, but that doesn’t seem to solve the problem. I am thoroughly confused. Anybody has ideas? Should I dump my repos and start fresh? Thanks, Ben Root _Darren_Dale2 February 25, 2011, 7:11pm 2 Ok, I am still learning quite a bit about git, please bear with me. I am having difficulty completing a pull request that I opened. In general, I don't think we should close our own pull requests.

It short-circuits the review process. When I try to merge the changes to upstream, they get rejected. I can merge it back to my own master, and can even push it up to my github repo's master, but not matplotlib's master. After some investigation, I am left wondering if the cause might be that my branches were branched off of my (un-updated) master (which tracked my github's master, not matplotlib's master). I have tried rebasing my branches, but that doesn't seem to solve the problem.

I am thoroughly confused. Anybody has ideas? Should I dump my repos and start fresh? No, don't do that. Which repository are you trying to push to? You probably need to sync up with the remote. See the discussion on "git push" at the end of http://gitref.org/remotes/ ··· On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root < [email protected] ...> wrote: _Ryan_May February 25, 2011, 7:43pm 3 Agreed in principle. However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples?

I think there's a point of diminishing returns. Ryan ··· On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root < [email protected] ...> wrote: Ok, I am still learning quite a bit about git, please bear with me. I am having difficulty completing a pull request that I opened. In general, I don't think we should close our own pull requests. It short-circuits the review process. -- Ryan May Graduate Research Assistant School of Meteorology University of Oklahoma _Darren_Dale2 February 25, 2011, 7:48pm 4 I agree.

Hence the "in general" qualification. ··· On Fri, Feb 25, 2011 at 2:43 PM, Ryan May < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root < [email protected] ...> wrote: Ok, I am still learning quite a bit about git, please bear with me. I am having difficulty completing a pull request that I opened. In general, I don't think we should close our own pull requests.

It short-circuits the review process. Agreed in principle. However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples? I think there's a point of diminishing returns. _Ryan_May February 25, 2011, 7:56pm 5 Sorry. Glossed over that and took you mentioning it in this context as objecting to self-merging this particular set of simple changes. Ryan ··· On Fri, Feb 25, 2011 at 1:48 PM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 2:43 PM, Ryan May < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root < [email protected] ...> wrote: Ok, I am still learning quite a bit about git, please bear with me.

I am having difficulty completing a pull request that I opened. In general, I don't think we should close our own pull requests. It short-circuits the review process. Agreed in principle. However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples? I think there's a point of diminishing returns. I agree. Hence the "in general" qualification. -- Ryan May Graduate Research Assistant School of Meteorology University of Oklahoma _John_Hunter February 25, 2011, 8:01pm 6 I just want to throw out there that in the migration to github, we never officially said we were going to switch the development process.

In fact, we said the opposite. After the migration, Jarrod suggested the pull request workflow as espoused in gitwash, and I am happy to experiment with it, but only to the extent that "it works", ie we are getting fast enough code reviews and pull requests closed that development is slowed significantly. In our experience on sf, we weren't doing a good job keeping up with submitted requests by non-developers on the trackers, much less reviewing the core devs' contributions.

Let he who thinks they can keep up with MD and JJ step forward... JDH ··· On Fri, Feb 25, 2011 at 1:43 PM, Ryan May < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root < [email protected] ...> wrote: Ok, I am still learning quite a bit about git, please bear with me. I am having difficulty completing a pull request that I opened.

In general, I don't think we should close our own pull requests. It short-circuits the review process. Agreed in principle. However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples? I think there's a point of diminishing returns. _Fernando_Perez1 February 25, 2011, 8:02pm 7 FWIW, my take on this question from the same conversation on ipython-dev a few days ago: http://mail.scipy.org/pipermail/ipython-dev/2011-February/007258.html Others seemed OK with that approach.

HTH, f ··· On Fri, Feb 25, 2011 at 11:48 AM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 2:43 PM, Ryan May < [email protected] ...> wrote: Agreed in principle. However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples? I think there's a point of diminishing returns. I agree. Hence the "in general" qualification. _Matthew_Brett February 25, 2011, 8:09pm 8 Yo, Agreed in principle.

However, do we as devs want to get/give reviews on every change that fixes typos in the docs or fixes stupid bugs in examples? I think there's a point of diminishing returns. I agree. Hence the "in general" qualification. FWIW, my take on this question from the same conversation on ipython-dev a few days ago: http://mail.scipy.org/pipermail/ipython-dev/2011-February/007258.html Others seemed OK with that approach. In nipy, we really haven't got into the swing of code review, but I see sympy going for it with enthusiasm, and they're better than us Our policy thus far has been: doc changes : go for it small bug fix with test : use judgment, probably go for it anything else : post and ask for review.

In general (TM). No review, after some period, perhaps with reminder, go for it. It may not be very obvious, but the wait-for-review step has far less inconvenient consequences using git than svn because it's so easy to merge, rebase and so on. (lurking now resumed), Matthew ··· On Fri, Feb 25, 2011 at 12:02 PM, Fernando Perez < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 11:48 AM, Darren Dale < [email protected] ...> wrote: On Fri, Feb 25, 2011 at 2:43 PM, Ryan May < [email protected] ...> wrote: _Fernando_Perez1 February 25, 2011, 8:11pm 9 One comment from the peanut gallery: what we've found in ipython is that the git pull request system does make the review process vastly more efficient.

The tool is good enough that we've been reviewing things

The rest of this page is on the live site.