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 an extend to @Eugene's answer another version which will work to push code from local repo to master/develop branch .
Switch to branch ‘master’:
$ git checkout master
Merge from local repo to master:
$ git merge --no-ff FEATURE/
Push to master:
$ git push