Resolve merge conflicts with main branch (node-forge already at 1.3.3) #41
Conversation
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
…e and refine tests
…ng; Add next step to deploy script
Enable 1-Click Deploy for bicep templates
…es; order Teams dialog
Bumps [mdast-util-to-hast](https://github.com/syntax-tree/mdast-util-to-hast) from 13.2.0 to 13.2.1. - [Release notes](https://github.com/syntax-tree/mdast-util-to-hast/releases) - [Commits](syntax-tree/mdast-util-to-hast@13.2.0...13.2.1) --- updated-dependencies: - dependency-name: mdast-util-to-hast dependency-version: 13.2.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Adding labs for MCP Server creation and its API Key management.
- Created a new tutorial on how to create a custom connector for MCP server. - Added category JSON for organizing MCP server documentation. - Included various media assets for visual guidance in the tutorials. - Developed comprehensive lessons on extending agent functionality with MCP tools, including BYO, managed, and custom connectors. - Enhanced existing documentation with prerequisites, step-by-step instructions, and troubleshooting tips for better user experience.
- Upgrade Docusaurus from 3.7.0 to 3.9.2 - Upgrade React and React-dom from 19.0.0 to 19.2.1 - Add logicapps-labs.sln for Visual Studio support
Docusaurus 3.9.2 requires Node.js >= 20.0
Update dependencies and add VS solution file
Add MCP Server Module.
Loan agent deployment
Clarified that default values in the agent card can be overridden.
Update note about agent card default values
Bump js-yaml from 3.14.1 to 3.14.2
…to-hast-13.2.1 Bump mdast-util-to-hast from 13.2.0 to 13.2.1
This merge resolves conflicts by accepting the current main branch state, which already has node-forge at version 1.3.3 (newer than the 1.3.2 this Dependabot PR was targeting). All conflicts have been resolved by taking the latest changes from main.
Copilot
AI
changed the title
[WIP] Update node-forge from 1.3.1 to 1.3.2
Resolve merge conflicts with main branch (node-forge already at 1.3.3)
Jan 8, 2026
Collaborator
|
@copilot can this be merged? |
Co-authored-by: wsilveiranz <13143907+wsilveiranz@users.noreply.github.com>
Author
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.
This Dependabot PR was opened to bump node-forge from 1.3.1 to 1.3.2, but the main branch has since been updated to 1.3.3, causing merge conflicts.
Changes
--allow-unrelated-historiesto resolve grafted commit historyThe PR now reflects the current state of main branch with all conflicts resolved and extra files cleaned up. The branch is fully synchronized with main and ready to merge. The original Dependabot update is superseded by the newer version already in main.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.