One of my patches made it into branch-1.1 (and a list of others) and was specifically not patched into into branch-1.1.0 by the committer. Before we delete any branches, let's do some diffing across branches to see what the differences are.
-Solomon On Fri, May 22, 2015 at 12:30 PM, Andrew Purtell <[email protected]> wrote: > So what should we do with branch-1.1? Delete it? > > > On Fri, May 22, 2015 at 5:09 AM, Ted Yu <[email protected]> wrote: > > > Thanks for the correction, Andrew. > > > > On Thu, May 21, 2015 at 10:43 PM, Andrew Purtell < > [email protected] > > > wrote: > > > >> I think there is some confusion here because I'd expect to make a 1.2 > >> release branch from branch-1, eventually. Branch-1 is even helpfully > >> versioned 1.2.0-SNAPSHOT. We have enough branches already (smile). > >> > >> > >> > On May 21, 2015, at 10:26 PM, lars hofhansl <[email protected]> wrote: > >> > > >> > Huh? We should create a 1.2 branch of branch-1. We do not need to have > >> a branch for every patch release.There's clearly something I am missing. > >> > -- Lars > >> > From: Ted Yu <[email protected]> > >> > To: "[email protected]" <[email protected]>; lars hofhansl < > >> [email protected]> > >> > Sent: Thursday, May 21, 2015 10:13 PM > >> > Subject: Re: Git branch-1.1.0? > >> > > >> > branch-1.1 corresponds to the (upcoming) 1.2.0 release. > >> > > >> > branch-1.1.0 was for the just released 1.1.0 > >> > > >> > Cheers > >> > > >> > > >> > > >> >> On Thu, May 21, 2015 at 10:00 PM, lars hofhansl <[email protected]> > >> wrote: > >> >> > >> >> Just saw we have a branch-1.1.0 branch in git. What do we use that > one > >> >> for? 1.1.x releases should be tags on branch-1.1, no? > >> >> Thanks. > >> >> -- Lars > >> > > >> > > >> > > > > >
