Skip to content

Commit a3233d2

Browse files
authored
chore(release): merge stable into release/7.71.0; resolve CHANGELOG (#27708) (#28016)
## Description Merges `stable` into `release/7.71.0` and resolves `CHANGELOG.md` conflicts so [PR #27708](#27708) (`release/7.71.0` → `stable`) can merge cleanly. ### CHANGELOG resolution (per local release changelog guidelines) - Kept **`## [7.71.0]`** (cleaned release notes) **above** **`## [7.70.1]`** / **`## [7.70.0]`** from stable. - **Compare links:** `[Unreleased]` → `v7.71.0...HEAD`; `[7.71.0]` → `v7.70.1...v7.71.0`; left `[7.70.1]` / `[7.70.0]` lines unchanged below. ### After this PR 1. Merge this PR into `release/7.71.0` using **Create a merge commit** (not squash), per release process. 2. Re-try / update [PR #27708](#27708). ## Changelog CHANGELOG entry: null --- Made with [Cursor](https://cursor.com) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Low risk: merge-conflict resolution focused on `CHANGELOG.md` ordering/compare links with no runtime code changes. > > **Overview** > Merges `stable` into `release/7.71.0` and resolves the `CHANGELOG.md` conflict by keeping the cleaned `7.71.0` notes above `7.70.1`/`7.70.0` and updating the compare links (`[Unreleased]` → `v7.71.0...HEAD`, `[7.71.0]` → `v7.70.1...v7.71.0`). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 424324a. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
2 parents 0ceeef0 + 424324a commit a3233d2

0 file changed

File tree

    0 commit comments

    Comments
     (0)