從master copy子分支

git status 查看當(dāng)前分支，顯示為master

# On branch master

創(chuàng)建一個子分支 dev

git checkout -b dev

子分支代碼合并到主干

先把子分支push到遠程倉庫

git push -u origin dev

切換分支到master

git checkout master

git pull

pull如果不正常需要先解決沖突

合并到master操作

git merge dev

git status?

# On branch master

# Your branch is ahead of 'origin/master' by 1 commit.

git push?origin master

合并完成