chore: back-merge main into develop after 2.4.0 - #134
Merged
Conversation
Release 2.4.0 — parameter forms, property paths and Connect your app
# Conflicts: # package-lock.json # package.json
Anoop-Variyan
approved these changes
Aug 26, 2026
Anoop-Variyan
left a comment
Anoop-Variyan
left a comment
Contributor
There was a problem hiding this comment.
Verified: merge topology is correct (genuine two-parent merge of main's tip into develop), version bumped to 2.5.0-SNAPSHOT in both package.json and package-lock.json (outer and nested entries), tag 2.4.0 confirmed on main's merge commit. 701/701 tests pass, lint clean, CI green, no leftover conflict markers. Approving.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Closes the 2.4.0 release:
developopens the next line, and stops diverging frommain.Two commits:
chore: bump version to 2.5.0-SNAPSHOT—package.jsonand both version fields ofpackage-lock.json, kept in lockstep.Merge branch 'main' into develop after 2.4.0— brings back main's release commit and the merge of #133. The only conflict was the version line, resolved by keeping develop's higher2.5.0-SNAPSHOT.The diff against
developis therefore just the three version fields; everything else in the merge is already there.Without this,
mainanddevelopstay apart on the version line and the next release PR conflicts on it — which is what happened at 2.1.1, where the tag and the back-merge were both missed and had to be done during 2.2.0.The
2.4.0tag is on main's merge commit2c8444f.701 tests pass.