"Merge conflict", translated

A merge conflict is two versions of the same file that both changed the same lines, and the computer refusing to guess which change you meant to keep. That's the whole concept. It feels apocalyptic because of how it's presented, not because of what it is.

How you got one without ever using git

Usually one of these:

• Two AI chats (or two tools, or you and the AI) edited the same project separately, and something is now trying to combine the results.
• A builder tool synced to GitHub while an edit happened on the other side of the sync.

What the scary markers mean

If you've seen something like this in a file:

The markers aren't damage. They show you both candidate versions stacked, with dividers, waiting for a human to pick. Top section: one version. Bottom section: the other. The job is to keep the right one (or combine them) and delete the divider lines.

The prompt that resolves it safely

The important part is "ask me which to keep." An AI that guesses can silently drop the version you wanted, which is how a merge conflict becomes actual lost work.

The version of this that doesn't hurt

The concept is fine; the presentation is hostile. In Plyo the same situation is called a Clash, and it looks like a choice, not an accident: the two versions appear side by side as cards ("Your draft" / "Live version"), you tap the one to keep for each difference, done. Same mechanics underneath, none of the archaeology.