Deterministic conflict resolution. No guessing.
Every hunk runs through a classifier of 10 deterministic patterns, each with its own confidence profile and automatic resolver. The trivial 95% is resolved without you. The rest is surfaced with a full decision trace — never a black box.
See it resolve a conflict in one second
GitWand reads code semantics, not just lines — and picks the right resolution for you.
10 patterns. Deterministic. Auditable.
Each pattern has its own confidence profile and automatic resolver. The classifier never guesses — when it can't be certain, it hands the hunk back to you with the trace.
same_changecertainBoth branches made the exact same edit.
one_side_changecertainOnly one branch touched this block.
non_overlappinghighAdditions at different positions in the block.
whitespace_onlyhighSame logic, different indentation or spacing.
reorder_onlyhighSame lines, different order.
insertion_at_boundaryhighNew lines added at the edge of a hunk.
value_only_changehighA scalar value (JSON, config) updated on one side.
section_only_changehighA document section edited on one side only.
llm_proposedmediumLLM-proposed resolution above the confidence threshold.
complexlowOverlapping edits — surfaced with full classification trace.
Numbers, not adjectives.
Performance measured on an M-series chip with typical repositories.