Home Explore Help
Register Sign In
david
/
apollo
mirror of https://github.com/ctripcorp/apollo
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Update CONTRIBUTING.md

Jason Song 6 years ago
parent
982a8e43c4
commit
3743d83641
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      CONTRIBUTING.md

+ 1 - 1
CONTRIBUTING.md
View File 

@@ -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
 
     2. Create a new branch and merge these commits into one
 
 
 
         * `git checkout -b <some-branch-name> <remote>/master`
 
         * `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).
 
 * 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).