flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [1/2] flink-web git commit: add guideline about merge commits
Date Thu, 08 Sep 2016 08:54:01 GMT
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 <mxm@apache.org>
Authored: Tue Aug 30 14:47:31 2016 +0200
Committer: Maximilian Michels <mxm@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} 
 


Mime
View raw message