Right, I'm still trying to figure out how to get the command line to generate targetApi = 21. That said, I was hoping to have the merges be neater for CB-8026, since the changes are made in two different files, respectively.
On Thu Jan 08 2015 at 10:48:50 AM Andrew Grieve <agri...@chromium.org> wrote: > Yes! Sounds good to me! Although I'm not sure there's much point in > creating the 3.7.x branch until CB-8026 is resolved and we set targetApi = > 21 > > On Thu, Jan 8, 2015 at 1:44 PM, Joe Bowser <bows...@gmail.com> wrote: > > > Sounds like this is all good. I'm going to create a 3.7.0 branch today > and > > start committing the fixes for CB-8026 into that. I'm going to hold off > on > > merging 4.0.x into master until I hear back from other people on this > > thread. > > > > On Wed Jan 07 2015 at 2:34:06 PM Joe Bowser <bows...@gmail.com> wrote: > > > > > Hey > > > > > > Do we have a 3.7.0 branch ready yet? I want us to get that ready and > > merge > > > the 4.0.x stuff into the master branch once we get 3.7.0 out. That way > > we > > > can finally go back to having a regular dev process. > > > > > > Are people opposed to us merging the 4.0.x branch into master once we > > > release 3.7.x and just treating 4.0.x like a full release branch? > > > > > > Joe > > > > > >
