Manage git flow

Git flow

 
xxxxxxxxxx
git branch development
git add *
git commit -m "my pretty commit"
git push -u origin development
git merge master (resolve any merge conflicts if there are any)
​
git checkout master
git merge development
git push -u origin master

https://stackoverflow.com/questions/14168677/merge-development-branch-with-master