AI Knowledge HubAPIs & Programming
conflict
If two people changed the same lines, the tool cannot decide which version wins and reports a conflict. It shows both versions side by side for you to choose. Leaving conflicts unresolved blocks later work, so they are best cleared immediately.
'Merge conflict' means several people edited the same lines.
Why it mattersTraces of two people editing the same lines remain. How those traces are resolved decides whether work can continue.
ExampleIf two people changed the same lines, the tool cannot decide which version wins and reports a conflict. It shows both versions side by side for you to choose. Leaving conflicts unresolved blocks later work, so they are best cleared immediately.