commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bruno P. Kinoshita" <brunodepau...@yahoo.com.br.INVALID>
Subject Re: [VFS] Deleting the git branch 'trunk'
Date Wed, 01 May 2019 23:02:01 GMT
 Yesterday I submitted a pull request against the wrong branch in GitHub. Spent a couple of
minutes scratching my head and trying to find out how to change that... then found the option
while editing it.

GitHub help has a page explaining how to do that: https://help.github.com/en/articles/changing-the-base-branch-of-a-pull-request

CheersBruno


    On Thursday, 2 May 2019, 10:23:50 am NZST, sebb <sebbaz@gmail.com> wrote:  
 
 On Wed, 1 May 2019 at 23:02, Gary Gregory <garydgregory@gmail.com> wrote:
>
> On Wed, May 1, 2019 at 5:30 PM sebb <sebbaz@gmail.com> wrote:
>
> > On Wed, 1 May 2019 at 21:48, Gary Gregory <garydgregory@gmail.com> wrote:
> > >
> > > On Wed, May 1, 2019 at 3:54 PM Gary Gregory <garydgregory@gmail.com>
> > wrote:
> > >
> > > > I created https://issues.apache.org/jira/browse/INFRA-18316
> > > >
> > >
> > > And the work is done. Note that open PRs on trunk have been closed
> > > automatically, so they would need to be re-opened.
> >
> > That sounds like a LOT of work.
> >
> > How can they be re-opened?
> >
>
> Here:
>
> https://issues.apache.org/jira/browse/INFRA-18316?focusedCommentId=16831238&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16831238
>
> Mark T. says this is a manual process.

Re-opening the PR is pretty easy.

However the PRs then need to be modified to be against master rather than trunk.

How does one do that?

> Gary
>
>
> >
> > > Gary
> > >
> > >
> > > >
> > > > Gary
> > > >
> > > > On Wed, May 1, 2019 at 3:55 AM Benedikt Ritter <britter@apache.org>
> > wrote:
> > > >
> > > >> Am Di., 30. Apr. 2019 um 14:43 Uhr schrieb Gary Gregory <
> > > >> garydgregory@gmail.com>:
> > > >>
> > > >> > Should we take a broader stroke and remove ALL trunk branches
from
> > all
> > > >> > Commons git repos?
> > > >> >
> > > >>
> > > >> I think we should remove all trunk branches from git repos.
> > > >>
> > > >>
> > > >> >
> > > >> > Gary
> > > >> >
> > > >> > On Mon, Apr 29, 2019 at 11:25 AM Otto Fowler <
> > ottobackwards@gmail.com>
> > > >> > wrote:
> > > >> >
> > > >> > > Probably need INFRA
> > > >> > >
> > > >> > >
> > > >> > > On April 29, 2019 at 11:23:38, Gary Gregory (
> > garydgregory@gmail.com)
> > > >> > > wrote:
> > > >> > >
> > > >> > > On Mon, Apr 29, 2019 at 11:22 AM Gary Gregory <
> > garydgregory@gmail.com
> > > >> >
> > > >> > > wrote:
> > > >> > >
> > > >> > > > Well, crud, neither these works:
> > > >> > > >
> > > >> > > > C:\git\commons-vfs>git push origin --delete trunk
> > > >> > > > remote: Rewinding refs/heads/trunk is forbidden.
> > > >> > > > remote:
> > > >> > > > To https://gitbox.apache.org/repos/asf/commons-vfs
> > > >> > > > ! [remote rejected] trunk (pre-receive hook declined)
> > > >> > > > error: failed to push some refs to '
> > > >> > > > https://gitbox.apache.org/repos/asf/commons-vfs'
> > > >> > > >
> > > >> > > > C:\git\commons-vfs> git push origin :trunk
> > > >> > > > remote: Rewinding refs/heads/trunk is forbidden.
> > > >> > > > remote:
> > > >> > > > To https://gitbox.apache.org/repos/asf/commons-vfs
> > > >> > > > ! [remote rejected] trunk (pre-receive hook declined)
> > > >> > > > error: failed to push some refs to '
> > > >> > > > https://gitbox.apache.org/repos/asf/commons-vfs'
> > > >> > > >
> > > >> > > > Thoughts?
> > > >> > > >
> > > >> > >
> > > >> > > BTW, I had deleted the branch locally OK with 'git branch
-d
> > trunk'
> > > >> > >
> > > >> > > Gary
> > > >> > >
> > > >> > >
> > > >> > > >
> > > >> > > > Gary
> > > >> > > >
> > > >> > > > On Mon, Apr 29, 2019 at 11:11 AM Rob Tompkins <
> > chtompki@gmail.com>
> > > >> > > wrote:
> > > >> > > >
> > > >> > > >> +1
> > > >> > > >>
> > > >> > > >> > On Apr 29, 2019, at 10:58 AM, Otto Fowler
<
> > > >> ottobackwards@gmail.com>
> > > >> > > >> wrote:
> > > >> > > >> >
> > > >> > > >> > +1
> > > >> > > >> >
> > > >> > > >> >
> > > >> > > >> > On April 29, 2019 at 08:01:43, Gary Gregory
(
> > > >> garydgregory@gmail.com
> > > >> > )
> > > >> > > >> wrote:
> > > >> > > >> >
> > > >> > > >> > I am going to delete the branch 'trunk'.
> > > >> > > >> >
> > > >> > > >> > It's too confusing.
> > > >> > > >> >
> > > >> > > >> > Gary
> > > >> > > >>
> > > >> > > >>
> > > >> > > >>
> > > >> ---------------------------------------------------------------------
> > > >> > > >> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> > > >> > > >> For additional commands, e-mail: dev-help@commons.apache.org
> > > >> > > >>
> > > >> > > >>
> > > >> > >
> > > >> >
> > > >>
> > > >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> > For additional commands, e-mail: dev-help@commons.apache.org
> >
> >

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org

  
Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message