• Preparing to merge
• Fast Forward Merge
• 3-way merge
• Resolving conflict