Clarify that only sub-directories containing package.mo are considered for conflict#3885
Merged
HansOlsson merged 4 commits intomodelica:masterfrom Apr 28, 2026
Merged
Conversation
maltelenz
reviewed
Apr 23, 2026
maltelenz
approved these changes
Apr 23, 2026
henrikt-ma
reviewed
Apr 23, 2026
Collaborator
|
I miss the normative change that makes it clear that a directory only qualifies as an entry if it contains package.mo (as opposed to qualifying by only being a directory, and than having to fulfill the requirement to contain package.mo). That is, replace this: by this: |
henrikt-ma
requested changes
Apr 23, 2026
Collaborator
henrikt-ma
left a comment
There was a problem hiding this comment.
We need normative rules outside the example, and no rules should be given in the example.
HansOlsson
commented
Apr 24, 2026
henrikt-ma
approved these changes
Apr 28, 2026
Collaborator
henrikt-ma
left a comment
There was a problem hiding this comment.
Sure, I'll try to take it from here in a separate PR that is not urgent to merge.
maltelenz
approved these changes
Apr 28, 2026
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.
Closes #3882