Multi-branch development

After the development of the code on the branch (dev) meet the standard on-line, to be incorporated into the master branch

git checkout dev

git pull

git checkout master

git go dev

git push -u origin master

 

When the code master code changes, the need to update the development branch (dev) on

git checkout master 

git pull 

git checkout dev

git merge master 

git push -u origin dev