Dicebot, el 10 de December a las 16:18 me escribiste:
> On Tuesday, 10 December 2013 at 15:09:13 UTC, Leandro Lucarella
> wrote:
> >I don't understand. Rebasing the release branch on top of master
> >shouldn't be an option, as it means you are taking all the changes
> >to
> >master and put them in
On Thursday, 12 December 2013 at 15:09:12 UTC, Leandro Lucarella
wrote:
Ah, perfect, then ignore my previous message :)
P.S. I have just made a test rebase to provide better
instructions for Andrew and can confirm that cherry-picked
commits still cause conflicts (as well as any other
same-conte
