This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.wiki.git
The following commit(s) were added to refs/heads/master by this push:
new a4c6013 Updated Pull Request Check In Steps (markdown)
a4c6013 is described below
commit a4c6013f7e73a2d0c4dce6066a882ccac2b3bf1b
Author: Hunter Lee <[email protected]>
AuthorDate: Mon Jul 29 11:12:44 2019 -0700
Updated Pull Request Check In Steps (markdown)
---
Pull-Request-Check-In-Steps.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Pull-Request-Check-In-Steps.md b/Pull-Request-Check-In-Steps.md
index 5781184..9f6365f 100644
--- a/Pull-Request-Check-In-Steps.md
+++ b/Pull-Request-Check-In-Steps.md
@@ -6,6 +6,6 @@
3. Leave a final comment on the PR stating "This PR is ready to be merged,
approved by [person who gave an approval, **tag their GitHub handle using @**]".
-4. If you have made multiple commits for one PR, these commits will be
squashed into one commit at merge time. If this is the case, you must include
the **final** commit message for the squashed commit in your final comment.
+4. If you have made multiple commits for one PR, these commits will be
squashed into one commit at merge time. If this is the case, you must include
one **final** commit message for the squashed commit in your final comment.
This way, the squashed commit will be merged into master cleanly, and the
history of all commits for the PR will be kept intact for future reference.
4. Helix PMC/Committers will only merge the PRs with **no pending comments and
with the final approval message** from Step 3.
\ No newline at end of file
