1.git status 查看是否为dev分支代码
2.git checkout master 检出为主线代码
3.git merge dev 合并分支代码,将当前主线分支指针指向dev
4.git pull 提交合并代码到主线
5.git push 提交本地代码到远程
6.git checkout dev_hdj 切换回分支代码
D:\BI-MIS\fs-bi-crm-report>git status
On branch dev_hdj
Your branch is up-to-date with 'origin/dev_hdj'.
nothing to commit, working directory clean
D:\BI-MIS\fs-bi-crm-report>git checkout master6.0_bug
Switched to branch 'master6.0_bug'
Your branch is ahead of 'origin/master6.0_bug' by 22 commits.
(use "git push" to publish your local commits)
D:\BI-MIS\fs-bi-crm-report>git pull
Username for 'http://git.firstshare.cn': huodj
Password for 'http://huodj@git.firstshare.cn':
Already up-to-date.
D:\BI-MIS\fs-bi-crm-report>git status
On branch master6.0_bug
Your bran