On Sun, May 29, 2016 at 08:40:58PM +0100, Guillaume Munch wrote: > Le 28/05/2016 22:49, Richard Heck a écrit : > > The old 2.3-staging > > branch has been merged into master. I'll plan to delete 2.3-staging > > completely in a few days. > > Rebasing local branches fails with strange conflicts. For instance one > conflict I have is because 49d52796 has not been applied to master. In > fact you have only applied 27 commits to master whereas it seems to me > that 2.3-staging has many more. Did you pull before rebasing ? ;)
I see the same. Scott
signature.asc
Description: PGP signature
