When you finish an exploratory chapter branch or an agent proposal, Roono's Three-Way Merge (⌘⇧M) reconciles divergent prose with manual review.
Starting a Merge (⌘⇧M)
Press ⌘⇧M in Timeline or Write mode to begin merging the active branch back into main. Roono computes the common ancestor Moment and highlights non-conflicting edits automatically.
Resolving Conflicting Paragraphs
If both branches modified the same paragraph, Roono presents a side-by-side reconciliation card. You can accept the current version, accept the incoming branch, or synthesize a combined edit.
Merge Audit in Timeline
A completed merge is itself a Moment. Timeline shows the ancestor, both branches, and the merge point, including agent proposal diamonds. Nothing in the earlier tracks is rewritten or deleted.