创建分支与合并

1.1创建dev分支，然后切换git checkout到dev分支：

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

git checkout命令加上-b参数表示创建并切换,相当于：
$ git branch dev
$ git checkout dev
Switched to branch 'dev'

1.2查看当前分支git branch

$ git branch
* dev
  master

git branch命令会列出所有分支，当前分支前面会标一个*号。

1.3修改file，在dev分支上正常提交

$ git add readme.txt 
$ git commit -m "branch test"
[dev fec145a] branch test
1 file changed, 1 insertion(+)

1.4切换回master合并merge分支并删除dev

$ git checkout master
Switched to branch 'master'

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

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

小结

查看分支：git branch

创建分支：git branch <name>

切换分支：git checkout <name>

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

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

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