fix: resolve package.json conflict with release branch#378
Merged
andreabadesso merged 3 commits intorelease-candidatefrom Mar 5, 2026
Merged
fix: resolve package.json conflict with release branch#378andreabadesso merged 3 commits intorelease-candidatefrom
andreabadesso merged 3 commits intorelease-candidatefrom
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
raul-oliveira
approved these changes
Mar 5, 2026
pedroferreira1
approved these changes
Mar 5, 2026
4 tasks
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
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.
Motivation
The release branch has
v1.11.2in package.json (from previous hotfixes), while release-candidate hasv1.12.0. This causes a merge conflict when merging release-candidate into release.This PR merges the release branch into release-candidate to resolve the conflict, keeping the version as
1.12.0.Acceptance Criteria
1.12.0Checklist
master, confirm this code is production-ready and can be included in future releases as soon as it gets merged