On Mon, Mar 28, 2011 at 2:02 PM, Jouni K. Seppänen wrote:
> Jouni K. Seppänen writes:
>
> > I tried to merge my changes into master with the no-op "ours" strategy
> > to prevent exactly this kind of problems while waiting for the other
> > request to move forward, but apparently I didn't do it r
Jouni K. Seppänen writes:
> I tried to merge my changes into master with the no-op "ours" strategy
> to prevent exactly this kind of problems while waiting for the other
> request to move forward, but apparently I didn't do it right. I'll take
> a look tonight (but right now I must attend to othe
Benjamin Root writes:
> I managed to merge my docfix/improve_description branch over to v1.0.x, but
> I am having trouble merging correctly over to master. It appears that the
> README.osx and make.osx files were changed in v1.0.x, but not in
> master.
That was me: those changes don't apply c
make judgment calls. Any
thoughts on this from the git masters?
Mike
From: Benjamin Root [ben.r...@ou.edu]
Sent: Monday, March 28, 2011 10:19 AM
To: matplotlib development list
Subject: [matplotlib-devel] problems merging docfixs to master from v1.0.x
Hello all,
I ma
Hello all,
I managed to merge my docfix/improve_description branch over to v1.0.x, but
I am having trouble merging correctly over to master. It appears that the
README.osx and make.osx files were changed in v1.0.x, but not in master. So
my merge wants me to resolve these differences -- which I a
