Skip to content

Merge maintenance/mps20241 into maintenance/mps20251#1635

Merged
kbirken merged 6 commits intomaintenance/mps20251from
merge/mps20241
Feb 9, 2026
Merged

Merge maintenance/mps20241 into maintenance/mps20251#1635
kbirken merged 6 commits intomaintenance/mps20251from
merge/mps20241

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Feb 9, 2026

Merge changes from maintenance/mps20241 to 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
…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
@kbirken kbirken enabled auto-merge February 9, 2026 20:36
kbirken
kbirken previously approved these changes Feb 9, 2026
Copy link
Member

@kbirken kbirken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cascading merge with some manual resolving.

Copy link
Member

@kbirken kbirken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

@kbirken kbirken merged commit a343300 into maintenance/mps20251 Feb 9, 2026
2 checks passed
@kbirken kbirken deleted the merge/mps20241 branch February 9, 2026 22:32
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