Merging develop branch into master

Summary: you need to switch to your develop branch, pull the code from the remote repo, then merge it into master (locally) and push it back to remote repo (into master branch)

git checkout develop
git pull origin develop
git checkout master
git merge develop
git push origin master

First commit your changes to master

 git checkout develop
 git pull origin develop
 git checkout master
 git merge develop
 git push origin master

Merge locally develop into master and then push

git checkout master
git merge develop
git push