Skip to content

Main2Dev @W-22462041@ Merging main to dev after v5.14.0#2058

Merged
nikhil-mittal-165 merged 2 commits into
devfrom
m2d/v5.14.0
Jun 29, 2026
Merged

Main2Dev @W-22462041@ Merging main to dev after v5.14.0#2058
nikhil-mittal-165 merged 2 commits into
devfrom
m2d/v5.14.0

Conversation

@svc-cli-bot

Copy link
Copy Markdown
Contributor

This branch and PR were automatically created following the successful release of v5.14.0.
It must be MERGED into dev, NOT SQUASHED OR REBASED. Squashing or rebasing this branch onto dev can cause potentially irreconcilable merge conflicts later.
As an additional safeguard and reminder, the title of this PR MUST include the word 'merging' in the description portion of the PR title, e.g., 'Main2Dev @W-XXXXXXX@ Merging main to dev after vX.Y.Z'.
If there are conflicts between dev and this branch, you should do the following locally:

  • $ git checkout dev
  • $ git pull
  • $ git fetch --all
  • $ git checkout m2d/v5.14.0
  • $ git pull origin dev --no-rebase # You MUST include this flag, or someone's day will be ruined.
  • Resolve the merge conflicts manually. When in doubt, ask the code's author for help.
  • $ git commit
  • $ git push

github-actions Bot and others added 2 commits June 25, 2026 04:35

@aruntyagiTutu aruntyagiTutu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is a standard main-to-dev merge PR following the v5.14.0 release. The changes are minimal and procedural:

✅ Version bump from 5.13.0 to 5.14.0 in package.json and package-lock.json
✅ PR body includes proper instructions for merge (must be MERGED, not squashed or rebased)
✅ Reminder to update title to include "merging" keyword per team convention

Action items:

  1. Update PR title to follow format: "Main2Dev @W-XXXXXXX@ Merging main to dev after v5.14.0"
  2. If conflicts arise, follow the documented resolution steps in the PR description
  3. MERGE (do not squash or rebase) once title is updated and tests pass

This is a routine post-release merge. Approved to unblock the process.

@nikhil-mittal-165 nikhil-mittal-165 changed the title Filler title. Read description and rename. Main2Dev @W-22462041@ Merging main to dev after v5.14.0 Jun 29, 2026
@nikhil-mittal-165 nikhil-mittal-165 merged commit ca605ec into dev Jun 29, 2026
26 of 27 checks passed
nikhil-mittal-165 added a commit that referenced this pull request Jun 29, 2026
Main2Dev @W-22462041@ Merging main to dev after v5.14.0
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