Git can merge the lines. The combined code can still break.
A textual merge conflict happens when Git cannot combine edits to the same content. A semantic conflict, sometimes called a logical merge conflict, happens when the combined changes no longer work together, even though the text merges cleanly.
Imagine two pull requests from the same main branch. The first renames an exported function and updates its existing callers. The second adds a new caller in another file.
Pull request A: rename the function
// money.ts: formatAmount is renamed
export function formatMoney(n) {
return `$${n.toFixed(2)}`;
}
Pull request B: add a new caller
// receipt.ts: new file
import { formatAmount } from './money';
export const total = formatAmount(20);
Each pull request passes its own checks against the original main. They edit different files, so Git merges them without conflict markers. Together, the new import refers to a function that no longer exists, and main breaks.
The fix keeps the rename and updates the new caller to formatMoney. Writing it requires knowing how the two changes relate.
Find the conflict. Resolve it where the changes meet.
Connect the affected code.
Merget’s PR graph follows definitions, callers and behavior across open pull requests, revealing conflicts beyond overlapping text.
Work in the queue’s actual order.
Merget prepares each pull request against main and the changes ahead of it. Deterministic rules and coding agents resolve conflicts; what cannot be resolved safely returns to a person.
Check the assembled result.
Merget checks its resolutions, then lands the result through your CI, review requirements and landing policy.
What a semantic merge queue adds to a merge queue.
| Feature | Semantic merge queue | Merge queue |
|---|---|---|
| Resolves merge conflicts | Yes | No: the pull request is removed |
| Finds clean merges that break the build | Yes | Only when CI fails on the combination |
| Writes the fix | Yes | No: the author or their agent does |
| Orders and tests pull requests before they land | Yes | Yes |
Semantic merge queues and the checks you still need.
What is a semantic conflict?
A semantic conflict is a conflict in meaning, not text: two changes merge cleanly in Git and the combined code no longer works. A renamed function and a new call to its old name is the classic case. See eight ways branches collide.
How is a semantic merge queue different from a merge queue?
A merge queue validates changes in sequence or in batches and removes the ones that fail. A semantic merge queue also analyzes how the changes relate in code and resolves their conflicts as part of preparing them. Compare merge queues.
Does a semantic merge queue replace CI?
No. CI tests the combined result; code analysis explains how changes conflict and guides the fix. Merget uses both, and your required checks decide what lands.
Why does this matter for parallel coding agents?
Each agent can produce a correct pull request without knowing what another agent changed. A semantic merge queue reconciles those changes before they land, so agents spend less time rebasing and repairing each other’s work. Merge queue for AI coding agents.
Can I see the conflicts before allowing any changes?
Yes. Merget starts in Advisory mode, which reports findings and suggests an order without changing source code or branches. Read the setup guide or sign up free.