Rebasing, Work and Feature Branching
willhackett.com