Skip to content

Filler title. Read description and rename. - #364

Open
svc-cli-bot wants to merge 7 commits into
devfrom
m2d/v1.21.0
Open

Filler title. Read description and rename.#364
svc-cli-bot wants to merge 7 commits into
devfrom
m2d/v1.21.0

Conversation

@svc-cli-bot

Copy link
Copy Markdown
Collaborator

This branch and PR were automatically created following the successful release of v1.21.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-xxxxxx@ 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/v1.21.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

@git2gus

git2gus Bot commented Jul 29, 2026

Copy link
Copy Markdown

Git2Gus App is installed but the .git2gus/config.json doesn't have right values. You should add the required configuration.

@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.

Content check: diff carries the already-reviewed v1.21.0 release changes (InsightsHandler/ApexGuru skip-notification feature, GUS info, dependency bumps, SHA256.md update) back into dev via the standard Main2Dev pattern. No unexpected changes.

Two things to flag before merge:

  1. Per this PR's own description, the title must include the word 'merging' (e.g., 'Main2Dev @w-xxxxxx@ Merging main to dev after v1.21.0') — it's still the default 'Filler title. Read description and rename.' placeholder.
  2. GitHub reports this PR as CONFLICTING (mergeable: CONFLICTING) — per the PR's own instructions, conflicts must be resolved locally with git pull origin dev --no-rebase, not by squashing/rebasing. This needs to be resolved before merge.

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