git分支管理
创建与合并分支
1. 创建和切换分支
# 创建dev分支
git barnch dev
# 切换到dev分支
git checkout dev
# 创建并切换到dev分支
git checkout -b dev
2. 查看当前所在分支
# 查看当前所在分支
git branch
3. 合并分支
git merge
命令用于合并指定分支到当前分支
# 把dev分支合并到master分支上
git merge dev
4. 删除分支
合并完成后,就可以放心的删除dev
分支了
# 删除dev分支
git branch -d dev
解决冲突
当两个分支各自有了提交的时候,git无法执行快速合并,这种合并有可能报冲突
$ git merge feature1
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
Git告诉我们,readme.txt文件存在冲突,必须手动解决冲突后再提交,我们可以直接查看readme.txt的内容
Git is a distributed version control system.
Git is free software distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes of files.
<<<<<<< HEAD
Creating a new branch is quick & simple.
=======
Creating a new branch is quick AND simple.
>>>>>>> feature1
Git用<<<<<<<
,=======
,>>>>>>>
标记出不同分支的内容,我们修改如下后保存:
Creating a new branch is quick and simple.
再提交
$ git add readme.txt
$ git commit -m "conflict fixed"
[master cf810e4] conflict fixed
最后,删除feature1
分支:
$ git branch -d feature1
Deleted branch feature1 (was 14096d0).