在本地wz-dev分支拉取远程dev总分支最新代码的流程

目的：自己本地有dev分支和wz-dev分支，远程有dev分支和wz-dev分支，想把远程dev分支上的最新代码拉到本地wz-dev分支上

（0）图片说明

（1）在wz-dev分支上进行git add .和git commit -m “”

git add .
git commit -m ""

（2）切换到dev分支，拉取代码，与本地wz-dev代码进行合并，推送合并后的代码到远程dev分支

git checkout dev 
git pull origin dev
git merge wz-dev
git push origin dev

（3）切换到wz-dev分支，与dev分支合并，将合并后的代码推送到远程wz-dev分支

git checkout wz-dev
git merge dev
git push (origin wz-dev)

E:\tools\blp-website>git checkout dev
Switched to branch 'dev'
Your branch is behind 'origin/dev' by 8 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

E:\tools\blp-website>git pull origin dev
Password authentication
(wangzhe@192.168.88.233) Password:
From ssh://192.168.88.233:29418/BandLanguagePlatform/tools
 * branch            dev        -> FETCH_HEAD
Updating aeeede7..1947c17
Fast-forward
 .../src/com/blp/compiler/entity/Delay.java         |   6 +
 .../src/com/blp/compiler/entity/Event.java         |  21 ++
 .../src/com/blp/compiler/entity/Template.java      |   2 +-
 .../blp/compiler/entity/ToolWordExtraValue.java    |   5 +
 .../blp/compiler/entity/UnitWordExtraValue.java    |   5 +-
 .../src/com/blp/compiler/entity/Word.java          |   3 +


E:\tools\blp-website>git merge wz-dev
Merge made by the 'ort' strategy.
 blp-editor/blp-editor/.eslintrc.js                 |    2 +-
 .../src/com/blp/website/action/EditorTool.java     |    2 +-
 10 files changed, 3472 insertions(+), 3838 deletions(-)

E:\tools\blp-website>git push origin dev
Password authentication
(wangzhe@192.168.88.233) Password:
Enumerating objects: 95, done.
Counting objects: 100% (69/69), done.
Delta compression using up to 4 threads
Compressing objects: 100% (34/34), done.
Writing objects: 100% (37/37), 23.00 KiB | 812.00 KiB/s, done.
Total 37 (delta 27), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (27/27)
remote: Updating references: 100% (1/1)
To ssh://192.168.88.233:29418/BandLanguagePlatform/tools.git
   1947c17..cd0e2ba  dev -> dev

E:\tools\blp-website>git checkout wz-dev
Switched to branch 'wz-dev'
Your branch is ahead of 'origin/wz-dev' by 2 commits.
  (use "git push" to publish your local commits)

E:\tools\blp-website>git merge dev
Updating 6bff8e1..cd0e2ba
Fast-forward
 .../src/com/blp/compiler/entity/Delay.java         |   6 +
 .../src/com/blp/compiler/entity/Event.java         |  21 ++

E:\tools\blp-website>git push origin wz-dev
Password authentication
(wangzhe@192.168.88.233) Password:
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Updating references: 100% (1/1)
To ssh://192.168.88.233:29418/BandLanguagePlatform/tools.git
   aeeede7..cd0e2ba  wz-dev -> wz-dev
E:\tools\blp-website>git push
Password authentication
(wangzhe@192.168.88.233) Password:
Password authentication
(wangzhe@192.168.88.233) Password:
Everything up-to-date