Prechádzať zdrojové kódy

Updated the page to reflect github changes.

mitm 6 rokov pred
rodič
commit
66159c697f

+ 18 - 7
src/docs/asciidoc/jme3/build_jme3_sources_with_netbeans.adoc

@@ -62,7 +62,7 @@ After some time the download will end.
 You now have a local copy of the `jmonkeyengine` repository. There are a few rules you need to follow in order to contribute.
 
 .Members & Non-Members Pull/Push
-Update your local copy and push commits by using the NetBeans command `menu:Git[Remote>Pull From Upstream]` or `menu:Git[Remote>Push To Upstream]`.
+Update your local copy and push commits by using the NetBeans command `menu:Git[Remote>Pull From Upstream]` or `menu:Git[Remote>Push To Upstream]`. Members will be pushing/pulling to/from the jMonkeyEngine repo and non-members to/from their fork of the jMonkeyEngine repo.
 
 .Non-Members
 To update *your fork* on GitHub:
@@ -70,20 +70,31 @@ To update *your fork* on GitHub:
 .  Go to your version of the repository on GitHub.
 .  Click the btn:[New Pull Request] button at the top.
 .  Note that the jMonkeyEngine repository will be on the left and your repository will be on the right.
-.  Click the btn:[Base Fork] button and from the drop down menu select your forked repository.
-.  Select the "`compare across forks`" link.
-.  Click the btn:[Head Fork] button and from the drop down list select "`jMonkeyEngine/jmonkeyengine`".
++
+--
+From here, there are two options for updating your fork.
+
+.Option A
+..  Click the btn:[Base Fork] button and from the drop down menu select your forked repository.
+..  Select the `_+++<u>compare across forks</u>+++_` link.
+..  Click the btn:[Head Fork] button and from the drop down list select "`jMonkeyEngine/jmonkeyengine`".
+
+.Option B
+..  Select the `_+++<u>switching the base</u>+++_` link.
+--
 .  Click the green button btn:[Create pull request].
 .  Give a succinct and informative title, in the comment field give a short explanation of the changes and click the green button btn:[Create pull request] again.
-.  Select the btn:[Commit And Merge] button.
-.  Press the btn:[Commit And Merge] button again to confirm your choice.
+.  Select btn:[Rebase And Merge] from the drop down menu.
+.  Press the btn:[Rebase And Merge] button again to confirm your choice.
 
 To submit changes to the jMonkeyEngine repository after pushing them to *your fork*:
 
 .  Go to your version of the repository on GitHub.
 .  Click the btn:[New Pull Request] button at the top.
 .  Note that the jMonkeyEngine repository will be on the left and your repository will be on the right.
-.  Click the green button btn:[Create pull request]. Give a succinct and informative title, in the comment field give a short explanation of the changes and click the green button btn:[Create pull request] again.
+.  Click the green button btn:[Create pull request].
+.  Give a succinct and informative title, in the comment field give a short explanation of the changes.
+.  Click the green button btn:[Create pull request] again to submit the request.
 
 .Everyone
 NOTE: See  link:https://github.com/jMonkeyEngine/jmonkeyengine/blob/master/CONTRIBUTING.md[How to contribute to jMonkeyEngine] before submitting a P/R.