singa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r954988 - in /websites/staging/singa/trunk/content: ./ develop/contribute-code.html
Date Tue, 16 Jun 2015 06:03:41 GMT
Author: buildbot
Date: Tue Jun 16 06:03:41 2015
New Revision: 954988

Log:
Staging update by buildbot for singa

Modified:
    websites/staging/singa/trunk/content/   (props changed)
    websites/staging/singa/trunk/content/develop/contribute-code.html

Propchange: websites/staging/singa/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 16 06:03:41 2015
@@ -1 +1 @@
-1685694
+1685711

Modified: websites/staging/singa/trunk/content/develop/contribute-code.html
==============================================================================
--- websites/staging/singa/trunk/content/develop/contribute-code.html (original)
+++ websites/staging/singa/trunk/content/develop/contribute-code.html Tue Jun 16 06:03:41
2015
@@ -358,10 +358,10 @@
 <p>Clone your fork, create a new branch (e.g., feature-foo or fixbug-foo),  work on
it. After finishing your job,  <a class="externalLink" href="https://git-scm.com/book/en/v2/Git-Branching-Rebasing">rebase</a>
it to the  current latest master and push commits to your own Github account (the new  branch).</p></li>
   
 <li>
-<p>Open a pull request against the master branch of apache/incubator-singa. The PR
title should be of the form SINGA-xxxx Title, where SINGA-xxxx is the relevant JIRA number,
and Title may be the JIRA&#x2019;s title or a more specific title describing the PR itself,
for example, &#x201c;SINGA-6 Implement thread-safe singleton&#x201d;. Detailed description
can be copied from the JIRA. Consider identifying committers or other contributors who have
worked on the code being changed. Find the file(s) in Github and click &#x201c;Blame&#x201d;
to see a 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&#x2019;s open source
license.</p></li>
+<p>Open a pull request against the master branch of apache/incubator-singa. The PR
title should be of the form SINGA-xxxx Title, where SINGA-xxxx is the relevant JIRA number,
and Title may be the JIRA&#x2019;s title or a more specific title describing the PR itself,
for example, &#x201c;SINGA-6 Implement thread-safe singleton&#x201d;. Detailed description
can be copied from the JIRA. Consider identifying committers or other contributors who have
worked on the code being changed. Find the file(s) in Github and click &#x201c;Blame&#x201d;
to see a 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&#x2019;s open source
license. Further commits (e.g., bug fix) to your new branch will be added to this pull request
automatically by Github.</p></li>
   
 <li>
-<p>Wait for one committer to review and merge (do not use rebase) the patch. Further
commits (e.g., bug fix) to your new branch will be added to this pull request automatically
by Github.</p></li>
+<p>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.</p></li>
 </ul></div></div>
                   </div>
             </div>



Mime
View raw message