feat(conflict): target-overlap analyzer using changeset resolver#223
Draft
behinddwalls wants to merge 1 commit into
Draft
feat(conflict): target-overlap analyzer using changeset resolver#223behinddwalls wants to merge 1 commit into
behinddwalls wants to merge 1 commit into
Conversation
This was referenced Jun 8, 2026
albertywu
reviewed
Jun 8, 2026
Contributor
There was a problem hiding this comment.
Should this implementation be called fileoverlap? Since it seems to be detecting overlapping files, not targets. And targetoverlap a separate implementation that uses tango?
Collaborator
Author
There was a problem hiding this comment.
seems like calude generated and published PR without me getting a change to review..but yes, it should be fileoverlap
albertywu
approved these changes
Jun 8, 2026
Add submitqueue/extension/conflict/fileoverlap, a conflict.Analyzer that flags two batches as conflicting when they change a common file. It is the first analyzer to use the capability the extension contract unblocks: it takes only batch identity and resolves each batch's changed files itself through an injected changeset.Resolver, derived from each change's provider details. A shared file is the concrete notion of target overlap, so it reports the existing conflict.ConflictTypeTargetOverlap — the type the contract named but for which no implementation could be written against an identity-only batch. No change to the conflict.Analyzer interface. The example wires a file-overlap-queue to it.
behinddwalls
force-pushed
the
preetam/ext/conflict-target-overlap
branch
from
f468e2c to
78c9f9e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Add submitqueue/extension/conflict/targetoverlap, a conflict.Analyzer that flags two batches as conflicting when they change a common file. It is the first analyzer to use the capability the extension contract unblocks: it takes only batch identity and resolves each batch's changed files itself through an injected changeset.Resolver, derived from each change's provider details.
ConflictTypeTargetOverlap was already named in the contract but had no implementation that could be written against an identity-only batch — this is that implementation. No change to the conflict.Analyzer interface. The example wires a target-overlap-queue to it.
Test Plan
Issues
Stack