git rebase vs merge

A practical Git branching workflow for teams of two to six: naming, commits, pull requests, merge strategies and conflict handling.