Updating a feature branch

Git

Bring your feature branch up to date with master.

git checkout master
git fetch -p origin
git merge origin/master
git checkout <feature-branch>
git merge master
git push origin <feature-branch>

Posts about software development, calligraphy,
coffee, and other stuff!