Master is ---> NOT <--- in use Master is basically where the cli code went into about 2 months ago, then stopped due to merge and other weird stuff that happened.
master2 is our current correct snapshot of code for the cli. On 7/4/13 10:18 AM, "Michal Mocny" <mmo...@chromium.org> wrote: >If master is in use, then I think that is a mistake. > >As far as I'm aware, master branch should be "dead" right? We had a >'next' >branch that was for 3.0 work which diverged from master and the merge back >was not clean (for various reasons), hence we "temporarily" went with a >master2 until we could just "overwrite" master. Since that seems to not >be >possible, Andrew is suggesting we go ahead with the not clean merge >(history may look awkward), but do away with this ridiculous situation. > >Did I summarize that right? > > >On Thu, Jul 4, 2013 at 1:01 PM, Brian LeRoux <b...@brian.io> wrote: > >> So, what is the difference between master and master2? Right now, >> master from what I understand is in heavy use w/ tonnes of bugs and >> fixes. >> >> On Thu, Jul 4, 2013 at 9:52 AM, Ian Clelland <iclell...@google.com> >>wrote: >> > We've had that ticket open for some time now, and Braden has tried on >>a >> > couple of occasions to get some movement on it, but there's been no >> action >> > so far. >> > >> > >> > On Thu, Jul 4, 2013 at 12:34 PM, Filip Maj <f...@adobe.com> wrote: >> > >> >> If you want to give it a shot, go for it! >> >> >> >> Didn't we have an INFRA issue filed for them to move the master HEAD >> >> pointer to master2 and fix this for us? :P >> >> >> >> On 7/4/13 9:23 AM, "Andrew Grieve" <agri...@chromium.org> wrote: >> >> >> >> >I feel that having master2 around is now causing us more harm than >> would >> >> >be >> >> >done if we just merged it into master. I'd like to merge it into >> master, >> >> >delete master2, and move on. >> >> >> >> >>
