GIT合并分支

提交:git commit -m‘modify search version‘ build.sbt
推送到远程:git push


合并分支
1 更新
gaowm@gaowm-ThinkPad-T430:~/workspace/cms-service$ git checkout develop
切换到分支 ‘develop‘
您的分支与上游分支 ‘origin/develop‘ 一致。
gaowm@gaowm-ThinkPad-T430:~/workspace/cms-service$ git pull　　　//拉取更新


2 合并
gaowm@gaowm-ThinkPad-T430:~/workspace/cms-service$ git checkout develop-find
切换到分支 ‘develop-find‘
gaowm@gaowm-ThinkPad-T430:~/workspace/cms-service$ git merge develop　　//把develop分支合并到当前develop-find分支

Merge made by the ‘recursive‘ strategy.
 cms-service-msgcenter/src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
gaowm@gaowm-ThinkPad-T430:~/workspace/cms-service$

GIT合并分支

原文：http://my.oschina.net/gaowm/blog/484995