I have a branch called develop in my local repo, and I want to make sure that when I push it to origin it\'s merged with the origin/master. Currently, when I push it\'s added to
As people mentioned in the comments you probably don't want to do that... The answer from mipadi is absolutely correct if you know what you're doing.
I would say:
git checkout master
git pull # to update the state to the latest remote master state
git merge develop # to bring changes to local master from your develop branch
git push origin master # push current HEAD to remote master branch