cask: merge multiple conflicts_with stanzas - #23506
Merged
MikeMcQuaid merged 1 commit intoAug 12, 2026
Merged
Conversation
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
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.
conflicts_withcan only appear once per cask: a second top-level stanza raises, and one in anon_*block replaces the top-level one. So a cask can't conflict with one cask everywhere and another on oneOS only.
Cask::DSLhas aTODOasking to merge instead, and the Cask Cookbook already documents multiple occurrences as allowed.Now each call merges into the previous ones as a set union, and the
NoOverridescop no longer flagsconflicts_with.No behavior change for existing casks: none of the 7,691 casks in homebrew-cask uses it more than once, and merging is idempotent so reloading gives the same result. Added a fixture cask, a DSL spec, and a
NoOverridescop spec.brewcommands to reproduce the bug?brew lgtm(style, typechecking and tests) locally?AI (Claude Code) assisted in writing the code and tests.
I reviewed the change and ran brew lgtm locally