[2/2] flink-web git commit: update website

[mx...@apache.org]

update website


Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/799a6cdc
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/799a6cdc
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/799a6cdc

Branch: refs/heads/asf-site
Commit: 799a6cdcf78efd3e03e60b85f5635a6a4e1e6e64
Parents: 6cf9326
Author: Maximilian Michels <mx...@apache.org>
Authored: Thu Sep 1 10:41:12 2016 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Sep 8 10:55:14 2016 +0200

----------------------------------------------------------------------
 content/contribute-code.html | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink-web/blob/799a6cdc/content/contribute-code.html
----------------------------------------------------------------------
diff --git a/content/contribute-code.html b/content/contribute-code.html
index b09c61e..7053627 100644
--- a/content/contribute-code.html
+++ b/content/contribute-code.html
@@ -277,6 +277,9 @@
   <li>
     <p><strong>Append review commits</strong>. When you get comments on the pull request asking for changes, append commits for these changes. <em>Do not rebase and squash them.</em> It allows people to review the cleanup work independently. Otherwise reviewers have to go through the entire set of diffs again.</p>
   </li>
+  <li>
+    <p><strong>No merge commits</strong>. Please do not open pull requests containing merge commits. Use <code>git pull --rebase origin master</code> if you want to update your changes to the latest master prior to opening a pull request.</p>
+  </li>
 </ul>
 
 <h3 class="no_toc" id="exceptions-and-error-messages">Exceptions and error messages</h3>