Hi Nicola,
creating PRs from a master branch of your fork to contribute to projects
should be fine, although this usually isn't best practice, since you
basically can only work on one PR at a time this way.
if you would like to fix this (or for future PRs) you can do the following:
assuming that your current branch is master, which is likely. (use git
status to be sure)
git checkout -b glassfish_fix
this will create a local branch with the name glassfish_fix from the
HEAD of master and switch to it right away. Since you had your commits
in master already, you basically already done. It will complain if you
have uncommitted changes before it can switch branches.
now push to github
git push [email protected]:nicolaken/netbeans glassfish_fix:glassfish_fix
although specifying glassfish_fix:glassfish_fix twice redundant, i
always add it as last check to make sure i push to the right branch and
from the right branch.
to get back to your master branch:
git checkout master
github should show you a green PR button somewhere noticing that you
just pushed a new branch.
hope this helps a bit
best regards,
michael
On 13.07.21 18:15, Nicola Ken Barozzi wrote:
Hello everyone.
I have tried fixing NETBEANS-5734 (JDK-Selection for Glassfish 6.1 is
restricted to JDK 1.8) and since I may have some time available I would
like to try and make a PR for it.
I need help not only because it's my first look inside Netbeans, but
because it's almost 15 years since my last contribution to open source, and
at that time it was all patches and SVN.
I'm trying to get used to Github, but it will take some time till I can
totally wrap my head around it, so please bear with me.
I have made a commit on my fork to show what I have done till now, but IIUC
to make a PR I should make a feature branch, do the commit there and make a
PR.
Since I committed on my master I guess I have to delete the fork and redo
it... I'm really sorry but I thought it would be easier to grasp.
This is the commit I have done:
-
https://github.com/nicolaken/netbeans/commit/672417e576d4f10b2a376d9337193823a126affb
I really don't like the change in
org.netbeans.modules.glassfish.common.StartTask.java, but don't know what
else to do...
Can someone take a quick look?
Thank you in advance.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
