feat: Interactive 3-Way Merge #28
Description
Description
When a file conflict occurs (e.g., the user edits a file while the agent is running), the agent either fails or overwrites changes. There is no UI to resolve conflicts.
Impact
- Frustrating workflow when user edits cause agent failures
- Manual copy-paste required to resolve conflicts
- High friction in the pair-programming loop
Potential Fix
Add an interactive TUI that shows Current, Incoming, and Result panes, allowing users to choose which blocks to keep.