You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mx...@apache.org on 2016/09/08 08:54:01 UTC
[1/2] flink-web git commit: add guideline about merge commits
Repository: flink-web
Updated Branches:
refs/heads/asf-site 190b3d610 -> 799a6cdcf
add guideline about merge commits
This closes #33
Project: http://git-wip-us.apache.org/repos/asf/flink-web/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink-web/commit/6cf93263
Tree: http://git-wip-us.apache.org/repos/asf/flink-web/tree/6cf93263
Diff: http://git-wip-us.apache.org/repos/asf/flink-web/diff/6cf93263
Branch: refs/heads/asf-site
Commit: 6cf9326328634186672ca4e1584672bbafec1ac3
Parents: 190b3d6
Author: Maximilian Michels <mx...@apache.org>
Authored: Tue Aug 30 14:47:31 2016 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Sep 8 10:54:06 2016 +0200
----------------------------------------------------------------------
contribute-code.md | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink-web/blob/6cf93263/contribute-code.md
----------------------------------------------------------------------
diff --git a/contribute-code.md b/contribute-code.md
index 480f3f6..0267915 100644
--- a/contribute-code.md
+++ b/contribute-code.md
@@ -101,6 +101,8 @@ It is also possible to attach a patch to a [JIRA]({{site.FLINK_ISSUES_URL}}) iss
- **Append review commits**. When you get comments on the pull request asking for changes, append commits for these changes. *Do not rebase and squash them.* It allows people to review the cleanup work independently. Otherwise reviewers have to go through the entire set of diffs again.
+- **No merge commits**. Please do not open pull requests containing merge commits. Use `git pull --rebase origin master` if you want to update your changes to the latest master prior to opening a pull request.
+
### Exceptions and error messages
{:.no_toc}
[2/2] flink-web git commit: update website
Posted by 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>