You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Łukasz Bownik <lu...@gmail.com> on 2022/04/14 19:58:55 UTC
PR merged, now what?
Hello.
I got my first PR merged.
Can I continue development on my branch or shall i create new branch for
each pull request?
Do you guys prefer small or larger PRs?
Re: PR merged, now what?
Posted by Matthias Bläsing <mb...@doppel-helix.eu>.
Hi,
Am Donnerstag, dem 14.04.2022 um 13:15 -0700 schrieb Łukasz Bownik:
> What about branching. May I keep pumping PRs from the same branch?
For the size: Changes should be focused on a problem and driven by it.
If that means the changes becomes bigger so be it. You should keep in
mind, that someone else needs to understand what you did and why you
did it. The more changes are there, the bigger the chance, that it will
be hard to find a reviewer.
For the branch: Please always make sure your base is up-to-date with
master and you create a fresh branch from that. If you don't do that,
you will hit merge conflicts, because others touched the same files,
that you did. The more recent your branch base, the less likely is a
conflict.
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: PR merged, now what?
Posted by Geertjan Wielenga <ge...@googlemail.com.INVALID>.
Not sure about that, lets see what others say.
Gj
On Thu, 14 Apr 2022 at 16:15, Łukasz Bownik <lu...@gmail.com> wrote:
> What about branching. May I keep pumping PRs from the same branch?
>
> On Thu, Apr 14, 2022, 1:08 PM Geertjan Wielenga
> <ge...@googlemail.com.invalid> wrote:
>
> > Small is good. :-)
> >
> > Gj
> >
> > On Thu, 14 Apr 2022 at 15:59, Łukasz Bownik <lu...@gmail.com>
> > wrote:
> >
> > > Hello.
> > > I got my first PR merged.
> > >
> > >
> > > Can I continue development on my branch or shall i create new branch
> for
> > > each pull request?
> > >
> > > Do you guys prefer small or larger PRs?
> > >
> >
>
Re: PR merged, now what?
Posted by Łukasz Bownik <lu...@gmail.com>.
What about branching. May I keep pumping PRs from the same branch?
On Thu, Apr 14, 2022, 1:08 PM Geertjan Wielenga
<ge...@googlemail.com.invalid> wrote:
> Small is good. :-)
>
> Gj
>
> On Thu, 14 Apr 2022 at 15:59, Łukasz Bownik <lu...@gmail.com>
> wrote:
>
> > Hello.
> > I got my first PR merged.
> >
> >
> > Can I continue development on my branch or shall i create new branch for
> > each pull request?
> >
> > Do you guys prefer small or larger PRs?
> >
>
Re: PR merged, now what?
Posted by Geertjan Wielenga <ge...@googlemail.com.INVALID>.
Small is good. :-)
Gj
On Thu, 14 Apr 2022 at 15:59, Łukasz Bownik <lu...@gmail.com> wrote:
> Hello.
> I got my first PR merged.
>
>
> Can I continue development on my branch or shall i create new branch for
> each pull request?
>
> Do you guys prefer small or larger PRs?
>
Re: PR merged, now what?
Posted by Michael Bien <mb...@gmail.com>.
a lot what Antonio described is setup work. Once your remote etc is
configured its a very quick process.
1) switch to master and pull from the apache netbeans repo
2) create a fresh branch from that
3) add commits
4) push to your clone, press the create PR button
If you don't use one branch per PR, you will only be able to work on one
thing at a time and if you don't get reviewers you are stuck waiting in
line.
-mbien
On 14.04.22 22:37, Łukasz Bownik wrote:
> Gee... it looks like a lot of work every time I submit a little PR to a
> module nobody else is working on. How about I continue with my current
> private branch until i change a module I work on or get conflists with
> master?
>
> On Thu, Apr 14, 2022, 1:28 PM antonio <an...@vieiro.net> wrote:
>
>> Hi,
>>
>> So you have forked the NetBeans repository at
>> https://github.com/lbownik/netbeans, and you've cloned it to a directory
>> in your laptop using "git clone", or something similar.
>>
>> This means that your clone (in your laptop) has a "remote" pointing to
>> your repository.
>>
>> This "remote" is usually called "origin" by default. If you run "git
>> remote -v" (to see the remotes) you should see something like:
>>
>> ----
>> $ git remote -v
>> origin git@github.com:lbownik/netbeans.git (fetch)
>> origin git@github.com:lbownik/netbeans.git (push)
>> ----
>>
>> With git you can have different remotes. We usually create another
>> remote (let's call it "upstream", but you can call it as you want)
>> pointing to Apache NetBeans directly:
>>
>> ----
>> git remote add upstream https://github.com/apache/netbeans.git
>> ----
>>
>> Now if you list the remotes again you'll see something like:
>>
>> ----
>> $ git remote -v
>> origin git@github.com:lbownik/netbeans.git (fetch)
>> origin git@github.com:lbownik/netbeans.git (push)
>> upstream https://github.com/apache/netbeans.git (fetch)
>> upstream https://github.com/apache/netbeans.git (push)
>> ----
>>
>> After one PR is merged to master you want to synchronize the "master"
>> branch in git@github.com:lbownik/netbeans.git with the "master" branch
>> in https://github.com/apache/netbeans.git. You do this as follows:
>>
>> ----
>> $ git fetch --all # fetches changes from all remotes
>> $ git checkout master # You move to _your_ master barnch
>> $ git merge upstream/master # You incorporate the changes from NetBeans
>> $ git push origin master # You update _your_ master branch
>> ----
>>
>> Now _your_ master branch (in your repo) is synchronized with NetBeans'
>> master branch.
>>
>> You now want to create some other patch, you usually do that in a new
>> branch, branching from your updated master, like so:
>>
>> ----
>> $ git checkout master
>> $ git checkout -b the-name-of-your-branch
>> ----
>>
>> And you create new commits or whatever in 'the-name-of-your-branch', You
>> then submit your PR as usual.
>>
>> HTH,
>> Antonio
>>
>>
>>
>>
>>
>> El 14/4/22 a las 21:58, Łukasz Bownik escribió:
>>> Can I continue development on my branch or shall i create new branch for
>>> each pull request?
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: dev-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: PR merged, now what?
Posted by Laszlo Kishalmi <la...@gmail.com>.
It's only the setup which requires slightly more configuration than usual.
The best practice is keep each PR in it's own branch. It is also
possible that your PR-s are not accepted/merged in that order you are
popping them out, so having them on one branch could be difficult. I
check out the apache/netbeans as "origin" and my fork as "mine". Pushing
the branches on "mine" then creating a PR via the github provided link.
On 4/14/22 13:37, Łukasz Bownik wrote:
> Gee... it looks like a lot of work every time I submit a little PR to a
> module nobody else is working on. How about I continue with my current
> private branch until i change a module I work on or get conflists with
> master?
>
> On Thu, Apr 14, 2022, 1:28 PM antonio <an...@vieiro.net> wrote:
>
>> Hi,
>>
>> So you have forked the NetBeans repository at
>> https://github.com/lbownik/netbeans, and you've cloned it to a directory
>> in your laptop using "git clone", or something similar.
>>
>> This means that your clone (in your laptop) has a "remote" pointing to
>> your repository.
>>
>> This "remote" is usually called "origin" by default. If you run "git
>> remote -v" (to see the remotes) you should see something like:
>>
>> ----
>> $ git remote -v
>> origin git@github.com:lbownik/netbeans.git (fetch)
>> origin git@github.com:lbownik/netbeans.git (push)
>> ----
>>
>> With git you can have different remotes. We usually create another
>> remote (let's call it "upstream", but you can call it as you want)
>> pointing to Apache NetBeans directly:
>>
>> ----
>> git remote add upstream https://github.com/apache/netbeans.git
>> ----
>>
>> Now if you list the remotes again you'll see something like:
>>
>> ----
>> $ git remote -v
>> origin git@github.com:lbownik/netbeans.git (fetch)
>> origin git@github.com:lbownik/netbeans.git (push)
>> upstream https://github.com/apache/netbeans.git (fetch)
>> upstream https://github.com/apache/netbeans.git (push)
>> ----
>>
>> After one PR is merged to master you want to synchronize the "master"
>> branch in git@github.com:lbownik/netbeans.git with the "master" branch
>> in https://github.com/apache/netbeans.git. You do this as follows:
>>
>> ----
>> $ git fetch --all # fetches changes from all remotes
>> $ git checkout master # You move to _your_ master barnch
>> $ git merge upstream/master # You incorporate the changes from NetBeans
>> $ git push origin master # You update _your_ master branch
>> ----
>>
>> Now _your_ master branch (in your repo) is synchronized with NetBeans'
>> master branch.
>>
>> You now want to create some other patch, you usually do that in a new
>> branch, branching from your updated master, like so:
>>
>> ----
>> $ git checkout master
>> $ git checkout -b the-name-of-your-branch
>> ----
>>
>> And you create new commits or whatever in 'the-name-of-your-branch', You
>> then submit your PR as usual.
>>
>> HTH,
>> Antonio
>>
>>
>>
>>
>>
>> El 14/4/22 a las 21:58, Łukasz Bownik escribió:
>>> Can I continue development on my branch or shall i create new branch for
>>> each pull request?
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: dev-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: PR merged, now what?
Posted by Łukasz Bownik <lu...@gmail.com>.
Gee... it looks like a lot of work every time I submit a little PR to a
module nobody else is working on. How about I continue with my current
private branch until i change a module I work on or get conflists with
master?
On Thu, Apr 14, 2022, 1:28 PM antonio <an...@vieiro.net> wrote:
> Hi,
>
> So you have forked the NetBeans repository at
> https://github.com/lbownik/netbeans, and you've cloned it to a directory
> in your laptop using "git clone", or something similar.
>
> This means that your clone (in your laptop) has a "remote" pointing to
> your repository.
>
> This "remote" is usually called "origin" by default. If you run "git
> remote -v" (to see the remotes) you should see something like:
>
> ----
> $ git remote -v
> origin git@github.com:lbownik/netbeans.git (fetch)
> origin git@github.com:lbownik/netbeans.git (push)
> ----
>
> With git you can have different remotes. We usually create another
> remote (let's call it "upstream", but you can call it as you want)
> pointing to Apache NetBeans directly:
>
> ----
> git remote add upstream https://github.com/apache/netbeans.git
> ----
>
> Now if you list the remotes again you'll see something like:
>
> ----
> $ git remote -v
> origin git@github.com:lbownik/netbeans.git (fetch)
> origin git@github.com:lbownik/netbeans.git (push)
> upstream https://github.com/apache/netbeans.git (fetch)
> upstream https://github.com/apache/netbeans.git (push)
> ----
>
> After one PR is merged to master you want to synchronize the "master"
> branch in git@github.com:lbownik/netbeans.git with the "master" branch
> in https://github.com/apache/netbeans.git. You do this as follows:
>
> ----
> $ git fetch --all # fetches changes from all remotes
> $ git checkout master # You move to _your_ master barnch
> $ git merge upstream/master # You incorporate the changes from NetBeans
> $ git push origin master # You update _your_ master branch
> ----
>
> Now _your_ master branch (in your repo) is synchronized with NetBeans'
> master branch.
>
> You now want to create some other patch, you usually do that in a new
> branch, branching from your updated master, like so:
>
> ----
> $ git checkout master
> $ git checkout -b the-name-of-your-branch
> ----
>
> And you create new commits or whatever in 'the-name-of-your-branch', You
> then submit your PR as usual.
>
> HTH,
> Antonio
>
>
>
>
>
> El 14/4/22 a las 21:58, Łukasz Bownik escribió:
> > Can I continue development on my branch or shall i create new branch for
> > each pull request?
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: PR merged, now what?
Posted by antonio <an...@vieiro.net>.
Hi,
So you have forked the NetBeans repository at
https://github.com/lbownik/netbeans, and you've cloned it to a directory
in your laptop using "git clone", or something similar.
This means that your clone (in your laptop) has a "remote" pointing to
your repository.
This "remote" is usually called "origin" by default. If you run "git
remote -v" (to see the remotes) you should see something like:
----
$ git remote -v
origin git@github.com:lbownik/netbeans.git (fetch)
origin git@github.com:lbownik/netbeans.git (push)
----
With git you can have different remotes. We usually create another
remote (let's call it "upstream", but you can call it as you want)
pointing to Apache NetBeans directly:
----
git remote add upstream https://github.com/apache/netbeans.git
----
Now if you list the remotes again you'll see something like:
----
$ git remote -v
origin git@github.com:lbownik/netbeans.git (fetch)
origin git@github.com:lbownik/netbeans.git (push)
upstream https://github.com/apache/netbeans.git (fetch)
upstream https://github.com/apache/netbeans.git (push)
----
After one PR is merged to master you want to synchronize the "master"
branch in git@github.com:lbownik/netbeans.git with the "master" branch
in https://github.com/apache/netbeans.git. You do this as follows:
----
$ git fetch --all # fetches changes from all remotes
$ git checkout master # You move to _your_ master barnch
$ git merge upstream/master # You incorporate the changes from NetBeans
$ git push origin master # You update _your_ master branch
----
Now _your_ master branch (in your repo) is synchronized with NetBeans'
master branch.
You now want to create some other patch, you usually do that in a new
branch, branching from your updated master, like so:
----
$ git checkout master
$ git checkout -b the-name-of-your-branch
----
And you create new commits or whatever in 'the-name-of-your-branch', You
then submit your PR as usual.
HTH,
Antonio
El 14/4/22 a las 21:58, Łukasz Bownik escribió:
> Can I continue development on my branch or shall i create new branch for
> each pull request?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists