On 04/16/2016 04:25 PM, Guillaume Munch wrote: > Le 16/04/2016 20:44, Richard Heck a écrit : >> >> We now have three staging branches. These are: >> >> 2.3-staging >> 2.2.1-staging >> 2.2.2-staging >> >> >> 2.3-staging can be treated as master usually is: It is for development >> on what will become 2.3 and is now open for commits. This branch will be >> merged into master after the release of 2.2.0. >> >> The 2.2.x-staging branches should be treated as 2.2.x usually is: They >> are open for commits to what will become the 2.2.x branch. The >> difference, obviously, is that 2.2.1-staging is for commits that will >> become part of 2.2.1; 2.2.2-staging is for commits that may not become >> part of 2.2.1 but will eventually go to 2.2.x. So commits to either of >> these branches need my approval. >> > > Thanks, it's clearer when there is a 2.2.2-staging branch available. > But why did you create it at b9b49d1c (before rc1) and not at 3d5cae4e > (master)?
Hmm. My master must not have been up to date. I've merged master into it so it is. I've done the same with the other branches, as we might as well start from as up to date as possible. Richard
