Manual merge of maintenance/mps20251 into master #1639
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
…d-Problem-&-Refactoring-#1590 # Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
Merge maintenance/mps20241 into maintenance/mps20251
…ation language ID and node ID is taken into account when calcualting unique IDs
…AssResultNonUnique (bugfix):InterpreterCoverageAssResult: uniqueID uses stable implement…
Merge maintenance/mps20241 into maintenance/mps20251
…ation editor to improve performance (#1620).
…_remove_hints_1620 Improve performance of building variant configuration editors
This reverts commit c98f967.
Merge maintenance/mps20241 into maintenance/mps20251
Details: - Remove deprecated concepts and interface concepts. - Move FeatureConfigButton to o.i.var.config.base. - Update virtual folders, no "configuration" folder needed anymore. - Remove dependencies which are no more needed. - Update CHANGELOG.
…s_related_to_configurations_1631 Variability: Remove deprecated concepts related to variant configurations
Update MPS to 2024.1.6
…s20241 # Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.editor.mps # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl # gradle/libs.versions.toml
Merge maintenance/mps20241 into maintenance/mps20251
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps # code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/org.iets3.variability.configuration.base.mpl # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/models/org.iets3.variability.featuremodel.base.behavior.mps # code/languages/org.iets3.opensource/languages/org.iets3.variability.featuremodel.base/org.iets3.variability.featuremodel.base.mpl
Closed
arimer
changed the title
arimer
changed the title
Member
Author
|
ATM the build is failing due to the licence scanner. |
Member
Author
|
fyi: auto merge PR did not work for: https://github.com/IETS3/iets3.opensource/actions/runs/21868725919 manuel merge of maintenance/mps20251 into this PR is required, otherwise we are missing commits on master. |
dbinkele
approved these changes
Feb 10, 2026
Member
|
Since this is merged, the merge/mps20251 branch can probably be deleted? |
Member
|
Then the cascading merge action should start working again. |
Member
|
I thought so, too. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
No description provided.