Question

I have a dev branch called “dev”. I’d like to move all the changes from “dev” to “master”.

I’m currently on the “dev” branch, can I just do:

git push origin master

and that’ll send all my changes up to “master”? Or must I switch to “master” first, then run:

git pull --rebase origin dev

I guess it’s just a push vs pull question, and which way git wants us to do that?

Thank you

Answer 1

Merge you changes first (locally).

git checkout master     # change to "master"
git merge dev           # merge changes from "dev"
git push origin master  # push the new "master" as is