Git dev分支合并到master分支

#先查看下当前的本地和远程分支

$ git branch -a  

  dev
* master
  remotes/origin/dev
  remotes/origin/master

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (master)
$

#切换到本地的dev分支

$ git checkout dev

Switched to branch 'dev'
Your branch is up to date with 'origin/dev'.

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (dev)
$ 

#将本地分支my_dev对应的远程分支dev拉下来

$ git pull

Username for 'https://github.com': ***@163.com
Already up to date.(代表已经更新最新代码)

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (dev)
$

#切换到master分支

$ git checkout master

Switched to branch 'master'

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (master)
$

#确保master分支也是最新的
 

$ git pull 

Already up to date.

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (master)
$

#执行合并的关键代码，此时执行结果时将本地的dev合并到本地master分支

$ git merge dev

Updating 29c7214..c845cb0
Fast-forward
 .../ym/bomaccounting/component/GoodsComponent.java | 103 ++++
 .../bomaccounting/controller/DetailController.java |   5 +-
 .../bomaccounting/controller/GoodsController.java  |   5 +-
 .../bomaccounting/controller/NoticeController.java | 105 ++++
 .../bomaccounting/controller/QuoteController.java  |  82 +++


M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (master)
$

#将合并的本地master分支推送到远程master

$ git push origin master

Username for 'https://github.com': 
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/wmm-lemon/bomaccounting.git
   29c7214..c845cb0  master -> master

M030087@YM-PCZ-040 MINGW64 ~/project/workspace/bomaccounting (master)
$ 

 

转至：https://blog.csdn.net/feeltouch/article/details/80849536