Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge maintenance/MPS-2022.3 into maintenance/MPS-2023.2 #231

Merged
merged 36 commits into from
Nov 11, 2024

Conversation

mps-ci-buildbot
Copy link
Contributor

Merge changes from maintenance/MPS-2022.3 to maintenance/MPS-2023.2.

alexanderpann and others added 30 commits September 18, 2024 13:15
* errors_suppressors.plugin: ensure error messages are normalized

* errors_suppressors.plugin: trimming line breaks with whitespace

Co-authored-by: Alexander Rimer <[email protected]>
…ure" - evaluation is not skipped and no whitelists are used (i.e. everything is GREEN)
* fixed IllegalModelAccessError in SuppressCheckerResults
…fix/arch_language_improvements

# Conflicts:
#	code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._080_lint_build.mps
@alexanderpann
Copy link
Member

alexanderpann commented Nov 10, 2024

@danielratiu why do we have 34 commits not merged into 2023.2? How did this happen?
I see that there was a PR #214 that contains all those commits?

@danielratiu danielratiu merged commit e3a30eb into maintenance/MPS-2023.2 Nov 11, 2024
1 check passed
@danielratiu danielratiu deleted the merge/MPS-2023.2 branch November 11, 2024 08:57
@danielratiu
Copy link
Member

@danielratiu why do we have 34 commits not merged into 2023.2? How did this happen? I see that there was a PR #214 that contains all those commits?

I think that last merge was "Squash and Merge" so the commits were not there in the history - now I performed a proper merge

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.

3 participants