Git ubuntu cheatsheat

Git cheat sheat

git


 (on branch development)$ git merge master
(resolve any merge conflicts if there are any)
git checkout master
git merge develop (there won't be any conflicts now)



or 

git branch develop
git add *
git commit -m “"
git push -u origin develop

git checkout master 
git merge develop
git push -u origin master