Skip to content

Merge/mps20251 2#1622

Closed
dbinkele wants to merge 25 commits intomasterfrom
merge/mps20251_2
Closed

Merge/mps20251 2#1622
dbinkele wants to merge 25 commits intomasterfrom
merge/mps20251_2

Conversation

@dbinkele
Copy link
Member

@dbinkele dbinkele commented Feb 3, 2026

No description provided.

dbinkele and others added 25 commits January 13, 2026 11:07
…d-Problem-&-Refactoring-#1590

# Conflicts:
#	code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.behavior.mps
…ctoring-#1590

Bugfix/fix diamond problem & refactoring #1590
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
@arimer
Copy link
Member

arimer commented Feb 4, 2026

Is this a "manual merge" verion of this PR: #1616?

@dbinkele
Copy link
Member Author

dbinkele commented Feb 5, 2026

Is this a "manual merge" verion of this PR: #1616?

During merging master the whole branch broke as I used a 20251-MPS. Therefore this new approach

@arimer
Copy link
Member

arimer commented Feb 5, 2026

You need to use the proper MPS version for master. Most latest pre-release version can be found and downloaded directly from the JB team city server: https://teamcity.jetbrains.com/buildConfiguration/MPS_20261_Distribution_DownloadableArtifacts/5859592?buildTab=artifacts

@arimer
Copy link
Member

arimer commented Feb 9, 2026

@dbinkele please be aware that this PR and the current automatically created merge-PR contain different changes: #1616

I am not sure if it still makes sense to merge this PR first and then update the other one or directly merge the #1616

@arimer
Copy link
Member

arimer commented Feb 10, 2026

closing in favor of #1639

@arimer arimer closed this Feb 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants