git checkout develop git pull origin develop git checkout master git merge develop git push origin master
with this method i merge develop into mast