Resolve merge conflicts: bump node-forge 1.3.1 → 1.3.2 onto current master#100
Merged
QilongTang merged 2 commits intodependabot/npm_and_yarn/node-forge-1.3.2from Feb 23, 2026
Merged
Conversation
Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Bump node-forge from 1.3.1 to 1.3.2
Resolve merge conflicts: bump node-forge 1.3.1 → 1.3.2 onto current master
Feb 23, 2026
QilongTang
merged commit 64b0e97
into
dependabot/npm_and_yarn/node-forge-1.3.2
10 checks passed
QilongTang
added a commit
that referenced
this pull request
Feb 23, 2026
* Bump node-forge from 1.3.1 to 1.3.2 Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Resolve merge conflicts: bump node-forge 1.3.1 → 1.3.2 onto current master (#100) * Initial plan * Resolve merge conflicts: rebase onto master with node-forge 1.3.2 Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ashish Aggarwal <ashish.aggarwal@autodesk.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: QilongTang <3942418+QilongTang@users.noreply.github.com>
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.
PR #93 (node-forge security bump) had become unmergeable due to divergence from master. Master had advanced to v1.0.31 with multiple dependency updates and new source files while the dependabot branch was still based on an older master state.
Changes
package-lock.json: Rebased onto master v1.0.31 (incorporates playwright, ajv, js-yaml updates) with node-forge updated to 1.3.2 (correct integrity hash +licensefield added)package.json: Synced to v1.0.31; addedtests/Toast.test.jstotest:unitscript to match masterSecurity fixes in node-forge 1.3.2
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.