查看当前分支git branch -a切换当前分支git checkout master新建并切换分支git checkout -b branchname合并分支git merge branchname