git合并分支步骤

git branch dev_1.1 dev //从dev分支创建dev_1.1分支，默认是从HEAD创建分支git checkout dev_1.1 //切换到dev_1.1分支git branch //查看本地分支git add ./ //添加dev_1.1所有修改文件到暂存区git commit -m "" //提交到dev_1.1git checkout master //切换到master分支git diff //查看差异git merge [--no-ff] -m "" dev_1.1 //合并dev_1.1到master,--no-ff参数可在分支历史保留合并信息，如果合并有冲突，就解决冲突git branch -d dev_1.1 //删除dev_1.1分支【git push origin dev_1.1 //把dev_1.1推送到远程git push origin :dev_1.1 //删除远程dev_1.1分支】