Re: Two module reviews in one PR

t;git branch -r" (or -rv) to see remote branches. >>> >>> -- >>> Cezariusz Marek >>> >>> >>> -Original Message----- >>> From: Geertjan Wielenga [mailto:geertjan.wiele...@googlemail.com] >>> Sent: Saturday, October 7,

Re: Two module reviews in one PR

"git branch -r" (or -rv) to see remote branches. >> >> -- >> Cezariusz Marek >> >> >> -Original Message- >> From: Geertjan Wielenga [mailto:geertjan.wiele...@googlemail.com] >> Sent: Saturday, October 7, 2017 11:22 AM >> To: dev@net

Re: Two module reviews in one PR

iele...@googlemail.com] > Sent: Saturday, October 7, 2017 11:22 AM > To: dev@netbeans.incubator.apache.org > Subject: Re: Two module reviews in one PR > > I've created two branches via the UI on GitHub: > > https://github.com/geertjanw/incubator-netbeans/branches > > How do

RE: Two module reviews in one PR

Use "git branch -r" (or -rv) to see remote branches. -- Cezariusz Marek -Original Message- From: Geertjan Wielenga [mailto:geertjan.wiele...@googlemail.com] Sent: Saturday, October 7, 2017 11:22 AM To: dev@netbeans.incubator.apache.org Subject: Re: Two module reviews in on

Re: Two module reviews in one PR

I've created two branches via the UI on GitHub: https://github.com/geertjanw/incubator-netbeans/branches How do I see them when I do 'git branch -v' or am I doing something wrong? Gj On Fri, Oct 6, 2017 at 11:07 PM, Matthias Bläsing wrote: > Hey Geertjan, > > Am

Re: Two module reviews in one PR

Hey Geertjan, Am Freitag, den 06.10.2017, 22:54 +0200 schrieb Geertjan Wielenga: > OK, many thanks, it all seems to work, took all the steps and almost > completely understood them, but at the final step permission was > denied. So, I need to set up SSH keys for this stage? Could you give the

Re: Two module reviews in one PR

OK, many thanks, it all seems to work, took all the steps and almost completely understood them, but at the final step permission was denied. So, I need to set up SSH keys for this stage? The other thing is that I am able to push directly to Apache Git (did several pushes, e.g., I pushed the

Re: Two module reviews in one PR

Hey Geertjan, for your situation you can do some git magic. The basic principle is, that you need to know, that branches and tags are just pointers to ObjectIDs. So we will now do some renaming. I'll also assume, that you have two remotes configured upstream: that points to the apache

Re: Two module reviews in one PR

If you have done a fork instead of a branch, how would this step above be done: git merge Thanks, Gj On Fri, Oct 6, 2017 at 8:11 PM, Matthias Bläsing wrote: > Hey Geertjan, > > Am Freitag, den 06.10.2017, 19:44 +0200 schrieb Geertjan Wielenga: > > Another

Re: Two module reviews in one PR

Hey Geertjan, Am Freitag, den 06.10.2017, 19:44 +0200 schrieb Geertjan Wielenga: > Another question -- once we have reviewed a PR, and there's consensus on > it, how do we do the merge? if the PR that should be merged was your own, you can do this: * git checkout master * git pull (assuming

Re: Two module reviews in one PR

Github has an extensive range of support pages concerning work with branches, forks and pull requests under https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/ You might find answers to a lot of questions there. Regards Martin Am 06.10.2017 10:44 schrieb

Re: Two module reviews in one PR

Another question -- once we have reviewed a PR, and there's consensus on it, how do we do the merge? I see that several merges have been done of module reviews, which is great, and I'd like to participate in that part, including for my own PRs -- so what did everyone do to enable them to become

Re: Two module reviews in one PR

So, we should each do a fork and then create a branch from that fork for each PR? If so, if possible could you update these instructions: https://cwiki.apache.org/confluence/display/NETBEANS/List+of+Modules+to+Review Gj On Fri, Oct 6, 2017 at 5:54 PM, Neil C Smith

Re: Two module reviews in one PR

I’ve used this answer in the past: https://stackoverflow.com/questions/6102297/how-do-i-clean-up-my-github-fork-so-i-can-make-clean-pull-requests?answertab=active#tab-top

Re: Two module reviews in one PR

Hi, You need a new git branch for every PR. This is the thing I mentioned always confuses people the other day. Best wishes, Neil On Fri, 6 Oct 2017, 16:50 Geertjan Wielenga, < geertjan.wiele...@googlemail.com> wrote: > OK. And how do I create separate PRs, instead of this one where I have

Re: Two module reviews in one PR

OK. And how do I create separate PRs, instead of this one where I have two commits in one PR: https://github.com/apache/incubator-netbeans/pull/69 Thanks, Gj On Fri, Oct 6, 2017 at 5:44 PM, Emilian Bold wrote: > Yeah, don't do that. If you delete your repo the PRs

Re: Two module reviews in one PR

Yeah, don't do that. If you delete your repo the PRs remain in a limbo state with the existing commits and you cannot change them ever. Just push --force into your broken branch and the PR will pick up the updated commits. --emi Pe 6 oct. 2017, la 18:35, Geertjan Wielenga

Re: Two module reviews in one PR

Great. Another newbie question -- what happens if I delete my fork, i.e., if I go to my own GitHub page and delete the fork of incubator-netbeans. What will then happen to my pull request? Will it be removed or is it, now that it exists, detached from my fork and only in the PR queue

Re: Two module reviews in one PR

Not a problem, you will get two commits when merged. --emi On Fri, Oct 6, 2017 at 5:47 PM, Geertjan Wielenga wrote: > Hi all, > > I messed up a bit and have two different modules reviewed in the same PR: > > https://github.com/apache/incubator-netbeans/pull/69