Merge maintenance/mps20232 into master #1263
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
Register a dummy migrate and remigrate task
Merge maintenance/mps20213 into maintenance/mps20222
Merge maintenance/mps20222 into maintenance/mps20223
Enable migration checking
toplevel.rt.rt: introduced hashCode() and equals for projection results.
# Conflicts: # build.gradle # code/languages/org.iets3.opensource/languages/org.iets3.components.functional/org.iets3.components.functional.mpl # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps # code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.toplevel/org.iets3.core.expr.genjava.toplevel.mpl # code/languages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected] # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd # code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.typetags.physunits.documentation/org.iets3.core.expr.typetags.physunits.documentation.msd # code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps # code/languages/org.iets3.opensource/tests/test.iets3.core.tracequery/test.iets3.core.tracequery.msd # code/languages/org.iets3.opensource/tests/test.node.expr.os/test.node.expr.os.msd # code/languages/org.iets3.opensource/tests/test.org.iets3.analysis.base/test.org.iets3.analysis.base.msd # code/languages/org.iets3.opensource/tests/test.ts.expr.os.comma/test.ts.expr.os.comma.msd
arimer
previously approved these changes
Mar 31, 2025
Member
arimer
left a comment
arimer
left a comment
There was a problem hiding this comment.
Cascading merge + manual merge conflict resolution
arimer
approved these changes
Mar 31, 2025
Member
|
migration checker ftw! 🚀 |
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/mps20232tomaster.