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
I don't know if a cherry-pick is required -- just someone who understands the
changes and knows how the merge should be performed. Back in the SVN days, we
encouraged the authors making changes on the maintenance branch to merge into
trunk (master), since they were best equipped to make judgmen
