git workflow

git_workflow.md

Merging

Merge master into branch

A good idea if upstream has had commits and, to catch up, you need to test your feature branch with changes from upstream included

git checkout feature
git pull origin master

Or if local master is already up to date with origin

git checkout feature
git merge master

See:

• git checkout feature1 git merge master
• git pull from master into the development branch

Merge branch into master

Once happy a feature is complete, tested and ready to go into master

git checkout master
git pull origin master
git merge feature
git push origin master

See:

• Best (and safest) way to merge a git branch into master