This is an automated email from the ASF dual-hosted git repository.
joern pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/opennlp-site.git
The following commit(s) were added to refs/heads/master by this push:
new 3792414 Change order of items in one-time-setup section
3792414 is described below
commit 379241443d07473c9e25b56bed85d53a7a2d8853
Author: Jörn Kottmann <[email protected]>
AuthorDate: Wed Jul 12 12:30:20 2017 +0200
Change order of items in one-time-setup section
---
src/main/jbake/content/using-git.ad | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/jbake/content/using-git.ad
b/src/main/jbake/content/using-git.ad
index 481021a..b7721d0 100644
--- a/src/main/jbake/content/using-git.ad
+++ b/src/main/jbake/content/using-git.ad
@@ -26,20 +26,20 @@ There are several ways to set up Git for committers and
contributors. Contributo
## One time setup
-- Create a Github account (if you do not have one already)
+- Create a Github account or use an existing one
+- Enable 2FA for the Github account, then logout and login
-
https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/[Configure
your ssh key]
-- Configure your
https://help.github.com/articles/setting-your-email-in-git/[user name and
Apache e-mail in git]
-- Fork the opennlp repositories:
+- Enter your Github username for your Apache account under
https://id.apache.org
+- Register here https://gitbox.apache.org/setup/
+- The gitbox setup will confirm that everything is working, to confirm again
check that you are listed as a member here:
https://github.com/orgs/apache/teams/opennlp-committers/members.
+- Fork the OpenNLP repositories:
* https://github.com/apache/opennlp-sandbox
* https://github.com/apache/opennlp-addons
* https://github.com/apache/opennlp-site
* https://github.com/apache/opennlp
-- Enable 2FA for your Github account, then logout and login (if already
enabled skip this step)
-- Enter your Github username for your Apache account under
https://id.apache.org
-- Register here https://gitbox.apache.org/setup/
-
-The gitbox setup will confirm that everything is working, to confirm again
check that you are listed as a member here:
https://github.com/orgs/apache/teams/opennlp-committers/members.
-
+- Configure your
https://help.github.com/articles/setting-your-email-in-git/[user name and
Apache e-mail in git]
+
+
## Configuring the upstream remote
git remote add upstream [email protected]:apache/opennlp.git
@@ -54,6 +54,7 @@ Please do not commit directly to the master branch. All
changes are done via Pul
To merge a PR via Github follow these steps:
+- Wait for two positive reviews
- Ensure the merge button is green (Travis CI build must have passed)
- Select the option “Rebase and merge”, “Squash and
merge” should only be used if the contributor is not providing a single
squashed commit
- Click on the merge button
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
