git

## 分支(分支名字dev)

创建分支：git branch dev

切换分支：git checkout dev

创建+切换分支：git checkout -b dev

查看当前分支：git branch

切换回master分支：git checkout master

合并指定分支到当前分支：git merge dev

(fast-forward 快进模式)

删除分支：git branch -d dev

## 获取代码

1.git status

2.git checkout master

3.git pull origin master

4.git checkout xiaojidan

5.git merge master

## 提交代码

1.git add .

2.git commit -m ' you comment'

3.git checkout master

4.git merge your-branch

5.git push

6.git checkout your-branch

7.git push origin your-branch

* 记得每次开发前都去服务器主分支下拉取最新代码