{Branch Management} Fix merge-base: Merge release 2.84.0 back to dev#32924
Merged
naga-nandyala merged 1 commit intodevfrom Mar 7, 2026
Merged
{Branch Management} Fix merge-base: Merge release 2.84.0 back to dev#32924naga-nandyala merged 1 commit intodevfrom
naga-nandyala merged 1 commit intodevfrom
Conversation
naga-nandyala
requested review from
jiasli,
kairu-ms and
wangzelin007
as code owners
️✔️AzureCLI-FullTest
|
️✔️AzureCLI-BreakingChangeTest
|
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR repairs the dev/release merge-base relationship (broken by a prior squash merge) by re-introducing the release-side hotfix content into dev, so a proper two-parent merge commit can be created via the documented local merge process.
Changes:
- Adds CredScan suppression placeholders for ARO unit-test dummy
client_secret/client_idvalues.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
yonzhan
approved these changes
Mar 6, 2026
jsntcy
approved these changes
Mar 6, 2026
teresaritorto
approved these changes
Mar 6, 2026
bebound
approved these changes
Mar 6, 2026
calvinhzy
approved these changes
Mar 6, 2026
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.
Fix merge-base between
releaseanddevPR #32896 (
{Branch Management} Merge release 2.84.0 back to dev) was squash-merged on 2026-03-04 instead of being merge-committed. This broke the merge-base betweenreleaseanddev.What happened
The hotfix PR #32847 (
{Misc.} Fix up credscan false positive) was merged torelease(commit6043dca9c2). Then PR #32896 was created to mergereleaseback todev, but it was squash-merged — producing a single-parent commit that copied the file content without linkingreleasehistory intodev.Current state (broken)
6043dca9c2(release HEAD)d01027d241(stuck)releaseis ancestor ofdev?What this PR does
This PR exists to satisfy the
azure-production-rulesetPR requirement. It will be merged locally usinggit merge --no-ffand pushed, creating a 2-parent merge commit that linksreleasehistory intodevand advances the merge-base.How to merge
🛑 Do NOT use the GitHub UI merge button or GitHub CLI
gh pr merge.Follow the documented hotfix process:
git checkout dev && git pull origin dev && git merge origin/release --no-ff -m "Merge release 2.84.0 back to dev"git push origin devFile changes
Only 1 file changed:
scripts/ci/credscan/CredScanSuppressions.json(12 additions) — the credscan false positive fix from PR #32847.Tested
This exact process was validated end-to-end on test branches (
naga_test_dev_2/naga_test_release_2) with a PR-required ruleset and no bypass privileges. See PR #32923 for the successful test.