Embed Notice

@ryanc @marshray @Natanox Yeah.
Having used many source code control systems over decades, that just deeply feels like a merge mistake.
Imagine some invisible whitespace change introduced by different tooling. A tab character or line terminator is automatically “normalized” before checkin.
Then the merge UI presents the developer with three lines in a row that all say “goto fail;”, each line a different color.
The developer must click the circle, the triangle, or the square, or an icon with all three, to resolve the conflict.
What’ll it be: “yours”, or “theirs”, “merged”, or “both”?