Git Workflow

In this week's video, Chris is joined by Josh Steiner to discuss the git and github workflow we use here at thoughtbot. We'll cover feature branches, pull requests, rebasing, and finally merging our new feature into master!

• thoughtbot dotfiles
• Giant Robots post on writing good commit messages
• Github help article on rebasing
• Atlassian Guide to Merge vs Rebase