02-分支

创建并新建分支

1
2
$ git checkout -b dev
Switched to a new branch 'dev'

用git branch命令查看当前分支:

1
2
3
$ git branch
* dev
master

切换回master分支:

1
2
$ git checkout master
Switched to branch 'master'

把dev分支的工作成果合并到master分支上:

1
2
3
4
5
$ git merge dev
Updating d17efd8..fec145a
Fast-forward
readme.txt | 1 +
1 file changed, 1 insertion(+)

删除dev分支

1
2
$ git branch -d dev
Deleted branch dev (was fec145a).

小结
Git鼓励大量使用分支:

查看分支:git branch

创建分支:git branch <name>

切换分支:git checkout <name>

创建+切换分支:git checkout -b <name>

合并某分支到当前分支:git merge <name>

删除分支:git branch -d <name>

最后记得推送