"git pull" or "git merge" between master and development branches

git workflow
Carson picture Carson · Dec 29, 2010 · Viewed 160.8k times · Source

I have my master branch and a develop branch for working on a few changes. I need to merge changes from master into develop, but will eventually merge everything from develop into master. I have two different workflows in mind:

  1. git pull origin master into develop branch
  2. git merge master into develop branch

Which is the best way to do this, and why?

Answer

Ian Lotinsky picture Ian Lotinsky · Dec 29, 2010

This workflow works best for me:

git checkout -b develop

...make some changes...

...notice master has been updated...

...commit changes to develop...

git checkout master
git pull

...bring those changes back into develop...

git checkout develop
git rebase master

...make some more changes...

...commit them to develop...

...merge them into master...

git checkout master
git pull
git merge develop

Related questions

What Git branching models work for you?

Our company is currently using a simple trunk/release/hotfixes branching model and would like advice on what branching models work best for your company or development process. Workflows / branching models Below are the three main descriptions of this I …

Read More
How can I get my C code to automatically print out its Git version hash?

Is there an easy way to write C code that can access its Git version hash? I wrote software in C to collect scientific data in a laboratory setting. My code records the data it collects in a .yaml file …

Read More
What is the difference between git push and git pull?

I just stumbled over something peculiar today. I asked a co-worker at my summer job to help me set up a new remote git repo for my code and there was a lot of confusion about what he did and …

Read More