I advocate leaving it in place. We've had several commits to trunk after, from N. It's not worth the pain.
On Fri, May 23, 2014 at 11:45 AM, Jimmy Xiang <[email protected]> wrote: > Cool, thanks. > > How about the merge? I know it's a different thing. > I was wondering if we have permission to do a force-push. > > > On Fri, May 23, 2014 at 11:39 AM, Andrew Purtell <[email protected] > >wrote: > > > In any event the offending branch is gone. You can garbage collect the > > stale remote ref with 'git remote prune origin' if you have it (or > > substitute 'origin' for whatever you may have changed the ASF remote to > if > > you renamed it). > > > > > > On Fri, May 23, 2014 at 11:31 AM, Andrew Purtell <[email protected] > > >wrote: > > > > > I tried that before but it failed. I tried it again just now for sanity > > > and it was allowed. I'm not sure if I mistyped or if a setting on the > > repo > > > was changed as Jake has since assigned the infra ticket to himself. > > > > > > > > > On Fri, May 23, 2014 at 11:25 AM, Todd Lipcon <[email protected]> > wrote: > > > > > >> Do you need an infra JIRA or can you just git push origin :trunk to > > delete > > >> it? (note the colon) > > >> > > >> > > >> On Fri, May 23, 2014 at 11:09 AM, Andrew Purtell <[email protected] > > >> >wrote: > > >> > > >> > Ok, no objections so INFRA-7800 > > >> > > > >> > > > >> > On Fri, May 23, 2014 at 10:29 AM, Ted Yu <[email protected]> > wrote: > > >> > > > >> > > 'trunk' should be removed in git repo. > > >> > > > > >> > > > > >> > > On Fri, May 23, 2014 at 10:24 AM, Jimmy Xiang < > [email protected]> > > >> > wrote: > > >> > > > > >> > > > +1. I was confused. > > >> > > > > > >> > > > > > >> > > > On Fri, May 23, 2014 at 10:22 AM, Andrew Purtell < > > >> [email protected] > > >> > > > >wrote: > > >> > > > > > >> > > > > Ram pushed up a commit as a new branch 'trunk' instead of to > > >> > 'master'. > > >> > > I > > >> > > > > will file an infra ticket to nuke the new branch 'trunk' as > this > > >> is > > >> > > going > > >> > > > > to confuse people. Objections? > > >> > > > > > > >> > > > > -- > > >> > > > > Best regards, > > >> > > > > > > >> > > > > - Andy > > >> > > > > > > >> > > > > Problems worthy of attack prove their worth by hitting back. - > > >> Piet > > >> > > Hein > > >> > > > > (via Tom White) > > >> > > > > > > >> > > > > > >> > > > > >> > > > >> > > > >> > > > >> > -- > > >> > Best regards, > > >> > > > >> > - Andy > > >> > > > >> > Problems worthy of attack prove their worth by hitting back. - Piet > > Hein > > >> > (via Tom White) > > >> > > > >> > > >> > > >> > > >> -- > > >> Todd Lipcon > > >> Software Engineer, Cloudera > > >> > > > > > > > > > > > > -- > > > Best regards, > > > > > > - Andy > > > > > > Problems worthy of attack prove their worth by hitting back. - Piet > Hein > > > (via Tom White) > > > > > > > > > > > -- > > Best regards, > > > > - Andy > > > > Problems worthy of attack prove their worth by hitting back. - Piet Hein > > (via Tom White) > > > -- Best regards, - Andy Problems worthy of attack prove their worth by hitting back. - Piet Hein (via Tom White)
