A Git Workflow Using Rebase
by Chris Belyea Git can be tricky to use, especially in a team setting where stale branches and merge conflicts tend to cause problems when you least have time for them. I've seen many teams turn their repository into a tangled mess as they struggle with Git.
https://medium.com/singlestone/a-git-workflow-using-rebase-1b1210de83e5