Author: wangwei
Date: Tue Jun 16 06:03:20 2015
New Revision: 1685711
URL: http://svn.apache.org/r1685711
Log:
add instructions for including the JIRA ticket in pull request and merge commit
Modified:
incubator/singa/site/trunk/content/markdown/develop/contribute-code.md
Modified: incubator/singa/site/trunk/content/markdown/develop/contribute-code.md
URL:
http://svn.apache.org/viewvc/incubator/singa/site/trunk/content/markdown/develop/contribute-code.md?rev=1685711&r1=1685710&r2=1685711&view=diff
==============================================================================
--- incubator/singa/site/trunk/content/markdown/develop/contribute-code.md
(original)
+++ incubator/singa/site/trunk/content/markdown/develop/contribute-code.md Tue
Jun 16 06:03:20 2015
@@ -36,7 +36,8 @@ code being changed. Find the file(s) in
line-by-line annotation of who changed the code last. You can add @username in
the PR description to ping them immediately.
Please state that the contribution is your original work and that you license
-the work to the project under the project's open source license.
-
-* Wait for one committer to review and merge (do not use rebase) the patch.
Further commits (e.g., bug fix)
+the work to the project under the project's open source license. Further
commits (e.g., bug fix)
to your new branch will be added to this pull request automatically by Github.
+
+* Wait for one committer to review the patch. If no conflicts, the committers
will merge it with
+the master branch. The merge should a) not use rebase b) disable fast forward
merge c) put the SINGA-xxx title in the first line of the merge commit message.
