Skip to content

fix: resolve package.json conflict with release branch#378

Merged
andreabadesso merged 3 commits intorelease-candidatefrom
fix/resolve-release-conflict-v1.12.0
Mar 5, 2026
Merged

fix: resolve package.json conflict with release branch#378
andreabadesso merged 3 commits intorelease-candidatefrom
fix/resolve-release-conflict-v1.12.0

Conversation

@andreabadesso
Copy link
Copy Markdown
Collaborator

Motivation

The release branch has v1.11.2 in package.json (from previous hotfixes), while release-candidate has v1.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

  • package.json conflict is resolved, keeping version 1.12.0

Checklist

  • If you are requesting a merge into master, confirm this code is production-ready and can be included in future releases as soon as it gets merged
  • Make sure either the unit tests and/or the QA tests are capable of testing the new features
  • Make sure you do not include new dependencies in the project unless strictly necessary and do not include dev-dependencies as production ones. More dependencies increase the possibility of one of them being hijacked and affecting us.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 5, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 8945c857-0391-4775-8f5f-e2fd1cdd51b6

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/resolve-release-conflict-v1.12.0

Comment @coderabbitai help to get the list of available commands and usage tips.

@andreabadesso andreabadesso self-assigned this Mar 5, 2026
@andreabadesso andreabadesso added the bug Something isn't working label Mar 5, 2026
@andreabadesso andreabadesso merged commit d6a18dc into release-candidate Mar 5, 2026
2 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Waiting to be deployed in Hathor Network Mar 5, 2026
@andreabadesso andreabadesso deleted the fix/resolve-release-conflict-v1.12.0 branch March 5, 2026 14:06
@andreabadesso andreabadesso moved this from Waiting to be deployed to Done in Hathor Network Mar 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants