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 able to do the merges? Thanks, Gj On Fri, Oct 6, 2017 at 5:56 PM, Geertjan Wielenga < [email protected]> wrote: > 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 < > [email protected]> wrote: > >> 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, < >> [email protected]> wrote: >> >> > 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 <[email protected]> >> > wrote: >> > >> > > 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 >> > <geertjan.wielenga@googlemail. >> > > com> a scris: >> > > >> > > > 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 >> > > incubator-netbeans? >> > > > >> > > > Thanks, >> > > > >> > > > Gj >> > > > >> > > >> On Fri, Oct 6, 2017 at 5:00 PM, Emilian Bold < >> [email protected]> >> > > wrote: >> > > >> >> > > >> Not a problem, you will get two commits when merged. >> > > >> >> > > >> --emi >> > > >> >> > > >> >> > > >> On Fri, Oct 6, 2017 at 5:47 PM, Geertjan Wielenga >> > > >> <[email protected]> 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 >> > > >>> >> > > >>> Is that a problem and can be something be done to fix it. >> > > >>> >> > > >>> Thanks, >> > > >>> >> > > >>> Gj >> > > >> >> > > >> > >> -- >> Neil C Smith >> Artist & Technologist >> www.neilcsmith.net >> >> Praxis LIVE - hybrid visual IDE for creative coding - www.praxislive.org >> > >
