Repository navigation
chore(sync): preserve main ancestry in next - #976
Merged
Merged
Conversation
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.11 to 3.4.12. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](cure53/DOMPurify@3.4.11...3.4.12) --- updated-dependencies: - dependency-name: dompurify dependency-version: 3.4.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…purify-3.4.12 build(deps): bump dompurify from 3.4.11 to 3.4.12
Bumps [fast-uri](https://github.com/fastify/fast-uri) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/fastify/fast-uri/releases) - [Commits](fastify/fast-uri@v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: fast-uri dependency-version: 3.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…t-uri-3.1.4 build(deps-dev): bump fast-uri from 3.1.3 to 3.1.4
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## next #976 +/- ##
==========================================
+ Coverage 51.58% 51.72% +0.13%
==========================================
Files 216 216
Lines 29400 29400
Branches 2507 2500 -7
==========================================
+ Hits 15167 15207 +40
+ Misses 14142 14102 -40
Partials 91 91 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
Summary
Preserve
mainancestry innextwith a merge commit based onnext.Four source commits (two dependency updates plus their PR merges) are absent by ancestry.
git cherryreports both patches as unmatched, but their effects are already covered by the broader398396bbpackage update innext. The resulting merge has zero file changes: both destination and merge have treee7188bf566ed5664af5cc98ad860ac44df697092. Review this as ancestry synchronization, not new dependency work.Evidence
mainis not an ancestor ofnext; four source commits are absent.npm cicompleted. Under Node 22.23.3,npm run test:coveragepassed (545 tests passed, four skipped; 173 files passed, one skipped).npx --no-install commitlint --from origin/next --to HEAD --verbosepassed.npm audit signaturespassed: 1,824 verified packages, 387 verified attestations.npm run lint:warnonlypassed as configured by CI. Underlying lint reports 247 errors and 40 warnings in the unchanged destination tree.Merge Danger
Door: two-way
Blast Radius: ancestry
Merge with a merge commit or fast-forward only; do not squash or rebase. Do not propagate
nexttobetauntil this PR has actually merged and the remote state has been fetched and reassessed.