git teamwork code delivery step

Our company consists of five individuals to develop a project at the same time, the big brother built a warehouse that we submit to unify the dev branch, my branch is hardy, as long as you change the value of the two branches can be used in your team. code show as below:

git add .

git commit -m "提交说明"

git push

git checkout dev

git pull

git checkout hardy

git merge dev

git push origin hardy:hardy

git push origin hardy:dev

 

1、git add .

Join cache

2, git commit -m "move complete filling end data"

Submitted to the local repository

3、git push

Submit to a remote repository

4、git checkout dev

Switching branch

5、git pull

Got me to branch code (Note: If the conflict need to manually resolve the conflict and implement steps 1,2,3)

6、git checkout hardy

Switching branch

7 git go dev

Merge code

8、git push origin hardy:hardy

Submitted to the remote branch library hardy

9、git push origin hardy:dev

Submitted to the remote branch library dev