Keep merge suffix for nested dictionaries #279
Merged
Conversation
This file contains 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
29c5767 to
620f3f5
Compare
KwisatzHaderach
approved these changes
Jan 16, 2025
psss
approved these changes
Jan 16, 2025
|
Failures are irrelevant, merging. |
620f3f5 to
4cf8e82
Compare
|
Ah, was not rebased... merging soon :) |
|
Not sure what is the problem with CI that it takes that long. Merging, the previous commit was about sphinx configuration which has zero effect on fmf code itself. |
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.
This is necessary to make possible merging dictionaries in adjust rules. Otherwise they would be always set (instead of update).
Fix: #276
Reopen: #190
Checklist