Update CONTRIBUTING.md

apolloconfig · Oct 14, 2018 · 3743d83 · 3743d83
1 parent 982a8e4
commit 3743d83
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -32,6 +32,6 @@ We provide template files [intellij-java-google-style.xml](https://github.com/ct
     2. Create a new branch and merge these commits into one
 
         * `git checkout -b <some-branch-name> <remote>/master`
-        * `git merge --squash master`
+        * `git merge --squash <current-feature-branch>`
 
 * When writing a commit message please follow these conventions: if you are fixing an existing issue, please add Fixes #XXX at the end of the commit message (where XXX is the issue number).