Eric Firing writes:
>> https://github.com/matplotlib/matplotlib/pull/17
>
> This brings up something that confuses me, together with related
> questions, and so might be another topic for this part of the docs:
>
> 1) How is it that you were able to add commits to a branch of someone
> else's f
On 03/07/2011 10:30 AM, Jouni K. Seppänen wrote:
>>> 5. v1.0.x doesn't merge cleanly into master
>>
>> What do you mean by this? What is the symptom?
>
> A merge conflict or (probably much less often) a test failure, because
> v1.0.x and master have diverged in the relevant part. An example is pu
Eric Firing writes:
>> git pull --ff-only upstream v1.0.x
>>
>> (This assumes an "upstream" remote pointing to
>> `git://github.com/matplotlib/matplotlib.git`.) Then merge your pull
>
> By default, however, if you have cloned from
> g...@github.com:matplotlib/matplotlib.git then instead of
On Mon, Mar 7, 2011 at 3:14 PM, Eric Firing wrote:
> On 03/07/2011 09:36 AM, Jouni K. Seppänen wrote:
>> I just wrote this as a response to a question on
>> https://github.com/matplotlib/matplotlib/pull/32
>> about how to merge to v1.0.x and master.
>>
>> Please feel free to comment or ask for det
Hi Jouni,
Thanks for doing this...
On Mon, Mar 7, 2011 at 2:36 PM, Jouni K. Seppänen wrote:
> I just wrote this as a response to a question on
> https://github.com/matplotlib/matplotlib/pull/32
> about how to merge to v1.0.x and master.
>
> Please feel free to comment or ask for details.
>
> ---
On 03/07/2011 09:36 AM, Jouni K. Seppänen wrote:
> I just wrote this as a response to a question on
> https://github.com/matplotlib/matplotlib/pull/32
> about how to merge to v1.0.x and master.
>
> Please feel free to comment or ask for details.
>
> -
