Merge maintenance/mps20241 into maintenance/mps20251 #1573
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
…ckfixes (#1570) Details: - Actually improve intention by using common code with "Update All Configs" - Ensure editors are updated, even if more than one editor is open for a root node - Update resolve infos
…o_changes_in_fm_1570 Improve intention "Adapt to Changes in Feature Model"
github-actions
bot
requested review from
arimer and
jonaskraemer
as code owners
…dling-of-root-constraints-with-grouping
…ing-of-root-constraints-with-grouping_1552 feature/variability improve handling of root constraints with grouping 1552
…s20241 # Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl
kbirken
approved these changes
Dec 19, 2025
Member
kbirken
left a comment
kbirken
left a comment
There was a problem hiding this comment.
Cascading merge, resolved conflict manually.
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.
Merge changes from
maintenance/mps20241tomaintenance/mps20251.