incubator-rocketmq-site git commit: Polish doc best-practice-pull-request

[yu...@apache.org]

Repository: incubator-rocketmq-site
Updated Branches:
  refs/heads/master a4ed6d331 -> 2e6e3f6b0


Polish doc best-practice-pull-request


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/2e6e3f6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/2e6e3f6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/2e6e3f6b

Branch: refs/heads/master
Commit: 2e6e3f6b05ca45eae7d86116ef64e87e223b2406
Parents: a4ed6d3
Author: yukon <yu...@apache.org>
Authored: Tue Dec 27 18:05:25 2016 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Dec 27 18:05:25 2016 +0800

----------------------------------------------------------------------
 _docs/06-best-practice-pull-request.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/2e6e3f6b/_docs/06-best-practice-pull-request.md
----------------------------------------------------------------------
diff --git a/_docs/06-best-practice-pull-request.md b/_docs/06-best-practice-pull-request.md
index b406903..f519c65 100644
--- a/_docs/06-best-practice-pull-request.md
+++ b/_docs/06-best-practice-pull-request.md
@@ -8,7 +8,7 @@ There are several ways to setup Git for committers and contributors. Contributor
 
 {% include toc %}
 
-# Git setup for Committers
+# Git setup for Contributors
 This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
 
 To attach to the apache git repo do the following:
@@ -61,9 +61,9 @@ Merging pull requests are equivalent to a "pull" of a contributor's branch:
 
     git checkout master      # switch to local master branch
     git pull apache master   # fast-forward to current remote HEAD
-    git pull --squash https://github.com/cuser/incubator-rocketmq.git cbranch  # merge to master
+    git pull --squash https://github.com/cuser/incubator-rocketmq.git ROCKETMQ-xxxx  # merge to master
     
---squash ensures all PR history is squashed into single commit, and allows committer to use his/her own message. Read git help for merge or pull for more information about --squash option. In this example we assume that the contributor's Github handle is "cuser" and the PR branch name is "cbranch". Next, resolve conflicts, if any, or ask a contributor to rebase on top of master, if PR went out of sync.
+--squash ensures all PR history is squashed into single commit, and allows committer to use his/her own message. Read git help for merge or pull for more information about --squash option. In this example we assume that the contributor's Github handle is "cuser" and the PR branch name is "ROCKETMQ-xxxx". Next, resolve conflicts, if any, or ask a contributor to rebase on top of master, if PR went out of sync.
 
 If you are ready to merge your own (committer's) PR you probably only need to merge (not pull), since you have a local copy that you've been working on. This is the branch that you used to create the PR.