Worktrees do not remove the collision. They move it to merge time.

Описание и применение

<p>Git worktrees give each coding agent its own checkout, so the agents stop overwriting each other's files. They do not remove the collision between what the agents are trying to do. That collision is still there, and with worktrees you find it later, when you merge the branches.</p> <p>Sometimes Git stops you at that point. Sometimes it merges cleanly and the damage is only visible if you go looking. Below is a small repository you can build in two minutes that shows both outcomes, then what you can check with Git alone and what you need to move earlier.</p> <p>A <strong>merge-time collision

Задача

<p>Git worktrees give each coding agent its own checkout, so the agents stop overwriting each other's files. They do not remove the collision between what the agents are trying to do. That collision is still there, and with worktrees you find it later, when you merge the branches.</p> <p>Sometimes Git stops you at that point. Sometimes it merges cleanly and the damage is only visible if you go looking. Below is a small repository you can build in two minutes that shows both outcomes, then what you can check with Git alone and what you need to move earlier.</p> <p>A <strong>merge-time collision

Результат

<p>Git worktrees give each coding agent its own checkout, so the agents stop overwriting each other's files. They do not remove the collision between what the agents are trying to do. That collision is still there, and with worktrees you find it later, when you merge the branches.</p> <p>Sometimes Git stops you at that point. Sometimes it merges cleanly and the damage is only visible if you go looking. Below is a small repository you can build in two minutes that shows both outcomes, then what you can check with Git alone and what you need to move earlier.</p> <p>A <strong>merge-time collision

Доказательства

Worktrees do not remove the collision. They move it to merge time.

Источник