On 05/29/2016 03:40 PM, 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
> confli
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
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
Le 28/05/2016 23:49, Richard Heck a écrit :
We now have a normal 2.2.x branch, which is open for development toward
2.2.1, under the usual rules, i.e., approval from me. The 2.2.1-staging
branch has been merged into it.
You should set the version as 2.2.1dev in configure.ac.
JMarc
With 2.2.0 having been released, we are back to a more normal
development model.
The master branch is now open for normal development work toward 2.3.0,
with a tentative release date of November. ;-) The old 2.3-staging
branch has been merged into master. I'll plan to delete 2.3-staging
completel
