fix: issue-5850 - Settle override conflicts between edges and propagate changes

workspaces/arborist/lib/override-set.js

@@ -193,10 +193,15 @@ class OverrideSet {
         return first
       }
     }
+
+    // The override sets are incomparable. Neither one contains the other.
     log.silly('Conflicting override sets', first, second)
   }
 
   static doOverrideSetsConflict (first, second) {
+    // If override sets contain one another then we can try to use the more specific one.
+    // This is imperfect, since we may lose some of the context of the less specific override
+    // set. But the more specific override set is more important to propagate, so we go with it.
     return (this.findSpecificOverrideSet(first, second) === undefined)
   }
 }