Skip to content

[WIP] Fix merge conflicts from ballerina-integrator-1.8.26032514 release#1829

Closed
Copilot wants to merge 1 commit intomainfrom
copilot/fix-merge-conflicts-ballerina-integrator
Closed

[WIP] Fix merge conflicts from ballerina-integrator-1.8.26032514 release#1829
Copilot wants to merge 1 commit intomainfrom
copilot/fix-merge-conflicts-ballerina-integrator

Conversation

Copy link
Copy Markdown

Copilot AI commented Mar 27, 2026

  • Fetch tag ballerina-integrator-1.8.26032514 and origin/main
  • Start merge of tag into branch
  • Resolve merge conflicts in:
    • common/autoinstallers/rush-plugins/pnpm-lock.yaml
    • common/config/rush/.pnpmfile.cjs
    • common/config/rush/pnpm-lock.yaml
    • workspaces/choreo/choreo-extension/package.json
    • workspaces/wso2-platform/wso2-platform-extension/package.json
  • Commit the merge

⚡ Quickly spin up Copilot coding agent tasks from anywhere on your macOS or Windows machine with Raycast.

@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

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