Consolidate Dependabot dependency updates and resolve merge conflicts#19
Merged
Consolidate Dependabot dependency updates and resolve merge conflicts#19
Conversation
…icts Co-authored-by: leeoades <2321091+leeoades@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Resolve simple conflicts in Dependabot PRs
Consolidate Dependabot dependency updates and resolve merge conflicts
Feb 18, 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.
Three Dependabot PRs (#15, #17, #18) had merge conflicts due to adjacent package reference updates in
.csprojfiles. PR #15 conflicted becauseMicrosoft.Extensions.DependencyInjectionwas already bumped to 9.0.13 in main.Changes
Test dependencies (6 test projects):
coverlet.collector: 6.0.2 → 6.0.4xunit: 2.9.2 → 2.9.3Microsoft.Extensions.DependencyInjection: preserved at 9.0.13 (resolves conflict)Source dependencies:
PolySharp: 1.14.1 → 1.15.0 inFunctionalStateMachine.CommandRunnerFiles modified:
samples/Basic/FunctionalStateMachine.Samples/FunctionalStateMachine.Samples.csprojsamples/StockPurchaser/StockPurchaserSampleApp.Tests/StockPurchaserSampleApp.Tests.csprojsamples/VendingMachine/VendingMachineSampleApp.Tests/VendingMachineSampleApp.Tests.csprojtest/FunctionalStateMachine.CommandRunnerTests/FunctionalStateMachine.CommandRunnerTests.csprojtest/FunctionalStateMachine.Core.Tests/FunctionalStateMachine.Core.Tests.csprojtest/FunctionalStateMachine.Diagrams.Tests/FunctionalStateMachine.Diagrams.Tests.csprojsrc/FunctionalStateMachine.CommandRunner/FunctionalStateMachine.CommandRunner.csproj💡 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.