Skip to content

Commit d644768

Browse files
committed
Add comments to doOverrideSetsConflict and findSpecificOverrideSet
1 parent 9172e56 commit d644768

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/shadow/arborist.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,9 @@ function doOverrideSetsConflict(
337337
first: OverrideSetClass | undefined,
338338
second: OverrideSetClass | undefined
339339
) {
340+
// If override sets contain one another then we can try to use the more specific
341+
// one. However, if neither one is more specific, then we consider them to be
342+
// in conflict.
340343
return findSpecificOverrideSet(first, second) === undefined
341344
}
342345

@@ -386,6 +389,7 @@ function findSpecificOverrideSet(
386389
}
387390
overrideSet = overrideSet.parent
388391
}
392+
// The override sets are incomparable. Neither one contains the other.
389393
log!.silly('Conflicting override sets', first, second)
390394
return undefined
391395
}

0 commit comments

Comments
 (0)