Re: [matplotlib-devel] github devel question

2011-02-26 Thread Jouni K . Seppänen
Benjamin Root writes: > 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. If you're followi

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Darren Dale
On Fri, Feb 25, 2011 at 3:16 PM, Eric Firing wrote: > On 02/25/2011 10:01 AM, John Hunter wrote: >> On Fri, Feb 25, 2011 at 1:43 PM, Ryan May  wrote: >>> On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale  wrote: On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root  wrote: > Ok, I am still learning q

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Eric Firing
On 02/25/2011 10:01 AM, John Hunter wrote: > On Fri, Feb 25, 2011 at 1:43 PM, Ryan May wrote: >> On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: >>> On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root wrote: Ok, I am still learning quite a bit about git, please bear with me. I am h

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Benjamin Root
On Fri, Feb 25, 2011 at 2:01 PM, John Hunter wrote: > On Fri, Feb 25, 2011 at 1:43 PM, Ryan May wrote: > > On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: > >> On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root wrote: > >>> Ok, I am still learning quite a bit about git, please bear with me. >

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Fernando Perez
On Fri, Feb 25, 2011 at 12:01 PM, John Hunter wrote: > 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

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Matthew Brett
Yo, On Fri, Feb 25, 2011 at 12:02 PM, Fernando Perez wrote: > On Fri, Feb 25, 2011 at 11:48 AM, Darren Dale wrote: >> On Fri, Feb 25, 2011 at 2:43 PM, Ryan May wrote: > >>> Agreed in principle. However, do we as devs want to get/give reviews >>> on every change that fixes typos in the docs or f

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Fernando Perez
On Fri, Feb 25, 2011 at 11:48 AM, Darren Dale wrote: > On Fri, Feb 25, 2011 at 2:43 PM, Ryan May 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 diminish

Re: [matplotlib-devel] github devel question

2011-02-25 Thread John Hunter
On Fri, Feb 25, 2011 at 1:43 PM, Ryan May wrote: > On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: >> On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root 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

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Ryan May
On Fri, Feb 25, 2011 at 1:48 PM, Darren Dale wrote: > On Fri, Feb 25, 2011 at 2:43 PM, Ryan May wrote: >> On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: >>> On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root wrote: Ok, I am still learning quite a bit about git, please bear with me. >

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Darren Dale
On Fri, Feb 25, 2011 at 2:43 PM, Ryan May wrote: > On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: >> On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root 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

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Ryan May
On Fri, Feb 25, 2011 at 1:11 PM, Darren Dale wrote: > On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root 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 ou

Re: [matplotlib-devel] github devel question

2011-02-25 Thread Darren Dale
On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root 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. >