• Introduction
• Assumptions
• Guide
• Updating upstream/master
• Updating our branch
• Testing
• Pushing
• Cleaning up your local history