• Setup
• Fixing Bugs
• Backporting a Fix
• Why merging forwards is important
• Why not always fix in main and then back port using cherry-pick?
• Dealing with changes to origin while forward merging