[weld-dev] Weld branches

[Jozef Hartinger]

That is basically what's happening. The only difference is that the new 
master branch will not appear immediately but sometime in June. I 
someone happens to miss this info and do a pull on their master branch 
in the meantime, a missing remote branch will be less confusing than a 
huge conflict.

On 05/23/2013 01:39 PM, Stuart Douglas wrote:
> Why not just start a new master based off 2.0, and remove the 2.0 
> branch? It does not look like the current master branch will get much 
> adoption, and this would make weld consistent with pretty much every 
> other JBoss project.
> Stuart
>
> Jozef Hartinger wrote:
>> Team,
>>
>> there are currently three main branches for Weld Core:
>>
>> - 1.1 - the Weld 1.1 branch used in JBoss AS 7, JBoss EAP and other EE6
>> application servers
>> - master - Weld 1.2 - basically the 1.1 branch with weld-osgi on top
>> - 2.0 - Weld 2.0 (CDI 1.1 implementation)
>>
>> This is confusing as git users usually expect to find the latest and
>> greatest in the master branch which is not the case for Weld. Therefore,
>> I am going to rename the master branch to a more appropriate name -
>> "1.2". If you do any work on the current master branch make sure to
>> apply your changes to "1.2" from now on.
>>
>> A new master branch will be added eventually when we start working on
>> Weld 2.1. In the meantime there will be no branch named "master".
>>
>> Jozef
>> _______________________________________________
>> weld-dev mailing list
>> weld-dev at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/weld-dev