Re: To branch or to fork.

2017-09-25 Thread Neil C Smith
On Mon, Sep 25, 2017 at 10:29 AM Daniel Gruno wrote: > However, do note that if you merge from > a fork via a PR, GitHub does some weird magic where it silently inserts > the changes into our repo and then merges it. This messes up the diffs > > Out of interest, I noticed a little while ago that

Re: To branch or to fork.

2017-09-25 Thread Daniel Gruno
On 09/25/2017 11:24 AM, Geertjan Wielenga wrote: > I would prefer this approach too, also since we're working in this way > naturally already, however I have seen "Can't you do that in a branch of > the ASF repository instead? It's better IMO if things stay here.” from > Bertrand, one of our mentor

Re: To branch or to fork.

2017-09-25 Thread Geertjan Wielenga
I would prefer this approach too, also since we're working in this way naturally already, however I have seen "Can't you do that in a branch of the ASF repository instead? It's better IMO if things stay here.” from Bertrand, one of our mentors. Hoping there'll be clarity on this point from our ment

Re: To branch or to fork.

2017-09-24 Thread Matthias Bläsing
Hi, Am Montag, den 25.09.2017, 01:05 +0200 schrieb Geertjan Wielenga: > See: > https://cwiki.apache.org/confluence/display/INFRA/Git+workflow+for+in > frastructure-puppet+repo > > Gj > > On Mon, Sep 25, 2017 at 12:54 AM, Geertjan Wielenga > wrote: > > > The Apache Way is to branch, rather tha

Re: To branch or to fork.

2017-09-24 Thread Dave Schoorl
Hi Geertjan, I assume you quote the workflow for infrastructure-puppet repo, because it also applies to Netbeans workflow? More concrete, for NETBEANS-54, will you, or another committer, create such a topic branch, and we will do PR against that branch? Kind regards, /Dave > > Op 25 se

Re: To branch or to fork.

2017-09-24 Thread Geertjan Wielenga
See: https://cwiki.apache.org/confluence/display/INFRA/Git+workflow+for+infrastructure-puppet+repo Gj On Mon, Sep 25, 2017 at 12:54 AM, Geertjan Wielenga < geertjan.wiele...@googlemail.com> wrote: > Hi all, > > The Apache Way is to branch, rather than fork -- the idea being that via > branches,

To branch or to fork.

2017-09-24 Thread Geertjan Wielenga
Hi all, The Apache Way is to branch, rather than fork -- the idea being that via branches, the code stays at Apache, rather than being somewhere else, i.e., in someone else's Git repo. >From the branch, reviews are done, prior to merging. We'll (I'll) also stop pushing straight to the ASF repo,