git多分支开发流程

1.初始化

cd lottery
git init

2.推送远程服务端

touch README
git add README 添加文件
git commit -m ‘first commit’
git remote add origin git@github.com/xxx/lottery.git

3.创建分支

git branch dev

4.查看分支

git branch -a

5.切换分支

git checkout dev

6.创建并切换分支

git checkout -b dev
…make some changes…
…notice master has been updated…
…commit changes to develop…

7.将所有修改过的工作文件提交暂存区

git add .

8.查看分支状态

git status

9.提交暂存区到仓库区

git commit -m “注释”

10.切换回主分支

git checkout master

11.从远程分支拉取更新

git pull
…bring those changes back into develop…

12.切换回来dev开发分支

git checkout dev

13.把主分支合并到当前分支

git rebase master
…make some more changes…
…commit them to develop…
…merge them into master…

14.把本地分支关联远程分支

git branch –set-upstream-to=origin/dev

15.把本地分支推送到远程分支

git push origin dev