[Scilab-Dev] 6.0 branched from master

[antoine.elias at scilab-enterprises.com]

Hello Samuel,

branch 6.0 is for version 6.0.0 to 6.0.x
branch master is for 6.1.0 to < 7.0.0

Normally, 6.0.1 is for bug fixes or small improvement.

In doubt, push your commits on branch master and we cherry pick commits 
on 6.0 branch if needed.
Branch 6.0 will be regularly merged in master. The opposite will never 
happen.

HTH
Antoine

Le 2017-02-17 18:41, Samuel Gougeon a écrit :
> Hello Clément,
> 
> Le 27/01/2017 à 18:13, Clément David a écrit :
>> Dear developers, advanced users,
>> 
>> The 6.0 branch has been created and will be used for Scilab 6.0.0 .
> 
> Now that this version is released, where should we commit changes for 
> 6.0.1?
> In my thoughts, 6.0 included all forthcoming 6.0.x. But the 6.0
> CHANGES is still the 6.0.0 one.
> 
> If merging 6.0 => master is always possible, i guess that at some
> point, merging master => 6.0 will become impossible unless releasing
> 6.1..
> 
> BR
> Samuel
> 
> _______________________________________________
> dev mailing list
> dev at lists.scilab.org
> http://lists.scilab.org/mailman/listinfo/dev