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 a remote develop branch.
How can I do this?
This question is related to
git
git-branch
remote-server
git-push
$ git push origin develop:master
or, more generally
$ git push <remote> <local branch name>:<remote branch to push into>
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/<branch_Name>
Push to master:
$ git push
You can also do it this way to reference the previous branch implicitly:
git checkout mainline
git pull
git merge -
git push
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
Follow the below steps for push the local repo into Master branchenter code here
$git status
Source: Stackoverflow.com