Repository: calcite
Updated Branches:
  refs/heads/master bcddfab9a -> a838a73c9


Add HOWTO about merging PRs for committers


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/a838a73c
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/a838a73c
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/a838a73c

Branch: refs/heads/master
Commit: a838a73c92575db16de337911564c90a9d4e967f
Parents: bcddfab
Author: Michael Mior <mm...@uwaterloo.ca>
Authored: Tue Apr 10 13:26:39 2018 -0400
Committer: Michael Mior <mm...@uwaterloo.ca>
Committed: Tue Apr 10 13:26:39 2018 -0400

----------------------------------------------------------------------
 site/_docs/howto.md | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/a838a73c/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 17a1cbc..b04b634 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -450,6 +450,15 @@ $ ./src/main/scripts/generate-protobuf.sh
 The following sections are of interest to Calcite committers and in
 particular release managers.
 
+## Merging pull requests (for Calcite committers)
+
+Ask the contributor to squash the PR into a single commit with a message 
starting with [CALCITE-XXX] where XXX is the associated JIRA issue number.
+You can take this step yourself if needed.
+The contributor's name should also be added in parentheses at the end of the 
first line of the commit message.
+Finally, after a couple new lines make sure the message contains "Close 
apache/calcite#YYY" where YYY is the GitHub issue number.
+This is important as it is the only way we have to close issues on GitHub 
without asking the originator to do so manually.
+When the PR has been merged and pushed, be sure to mark the JIRA issue as 
resolved (do not use closed as that is reserved for release time).
+
 ## Set up PGP signing keys (for Calcite committers)
 
 Follow instructions [here](https://www.apache.org/dev/release-signing) to

Reply via email to