Merge pull request #24 from JeffreyChu/master
This commit is contained in:
zjw
2016-05-29 21:25:24 +08:00
committed by Jerry Lee
parent f493cdc820
commit e8bd8e282a
4 changed files with 8 additions and 8 deletions

View File

@@ -137,8 +137,8 @@ git commit
# 拉取远程的develop分支并且当前分支本地分支some-feature合并上远程分支develop
git pull origin develop
git checkout develop
# 本地分支some-feature合并上some-feature
#【注意】已经这个分支已经有远程的develop修改了所以本地develop无需再做远程拉取的操作
# 本地分支some-feature合并上develop
#【注意】这个分支已经有远程的develop修改了所以本地develop无需再做远程拉取的操作
git merge some-feature
git push
# 删除本地分支