DEV Community

Discussion on: Git Branching, Step-by-Step

Collapse
jpgoldberg profile image
Jeffrey Goldberg

Should there be a git merge master between steps 6 and 7? I try to resolve conflicts, if any, before I submit the PR.

Collapse
thadevelyouknow profile image
Funda Author

the merge happens on the website not from the terminal. This is for students to be able to visualize it in the GUI.

Collapse
jrock2004 profile image
John Costanzo

So are you saying that git pull origin master is not required? Why would I pull master locally then just push my branch up?

Thread Thread
thadevelyouknow profile image
Funda Author

git pull origin master is being executed again at step 5. when you push to your branch it creates the pull request on the github website.

Collapse
marioestradarosa profile image
Mario Estrada • Edited on

Jeffrey,

Your question is valid 100%. after git checkout mybranchname we should perform a git merge master. It is at this stage that conflicts may appear and you have a chance to fix them. This way you make sure your branch won't conflict with the remote master branch.

Even more, when several developers are working release updates constantly to the master branch, we advise them to perform this sync process often to see how your changes operates in the whole application.