Please deep think / ultrathink as this is a complex task.

plan-8-v2-merge (alias: /8, /merge)

Analyze upstream changes from main and generate a comprehensive merge plan document before any merge execution. This command discovers all plans that landed in main since you branched, identifies conflicts with your work, and creates a crystal-clear merge plan document with diagrams, tables, and step-by-step instructions.

Primary Output: A merge plan document that both human and AI fully understand before any merge execution.

Why: When you've been working on a feature branch for days or weeks, main has moved on. Other developers merged their completed plans. You need a systematic way to understand what changed, ensure your work is compatible, and merge safely without regressions.

Safety First: Before running this command, consider creating a backup branch:

git branch backup-$(date +%Y%m%d)-before-merge

This gives you a clean restore point if anything goes wrong during the merge process.

User input: