Merge maintenance/mps20251 into master #1616
Closed
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
github-actions
bot
requested review from
arimer and
jonaskraemer
as code owners
Member
|
@dbinkele could you please take care of the merge conflicts and bring the changes on master? |
Member
|
@dbinkele could you please take care of the merge conflicts? |
…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).
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps # 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.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps
dbinkele
previously approved these changes
Feb 3, 2026
…_remove_hints_1620 Improve performance of building variant configuration editors
…y_1625 Variability: Improve IRenamer hierarchy and add documentation
Closed
Add missing dependencies revealed by latest MPS 2024.1.6
Bugfix/add SBOM deps
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.editor.mps # code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/org.iets3.variability.configuration.base.mpl # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
This reverts commit c98f967.
Merge maintenance/mps20241 into maintenance/mps20251
Member
|
Master was breaking due to reasons discussed and documented via slack. Aligning with master should help this PR. |
# Conflicts: # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/models/behavior.mps
Member
|
closing in favor of #1639 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Merge changes from
maintenance/mps20251tomaster.