🔀 3-Way Merge

Compare a Base version against two changed versions (Ours, Theirs) and spot conflicts instantly.

Base (original)

Ours (your changes)

Theirs (their changes)

Detects conflicts between Ours and Theirs