Summary

• When main has new commits but no merge conflicts, the "Rebase onto main" button is now styled as the primary (accent/bold) action
• "Rebase with AI" is only promoted to primary when conflicts are actually detected
• Previously, "Rebase with AI" was always styled as primary regardless of conflict state, leading users to overlook the simpler plain rebase option

Test plan

• Open merge dialog on a branch where main has new commits but no conflicts — verify "Rebase onto main" is the highlighted button
• Open merge dialog on a branch with actual conflicts — verify "Rebase with AI" is the highlighted button

🤖 Generated with Claude Code