Run go mod tidy to resolve merge conflicts in dependency backport#6383
Closed
Copilot wants to merge 2 commits intomergify/bp/8.19/pr-6377from
Closed
Run go mod tidy to resolve merge conflicts in dependency backport#6383Copilot wants to merge 2 commits intomergify/bp/8.19/pr-6377from
Copilot wants to merge 2 commits intomergify/bp/8.19/pr-6377from
Conversation
Copilot
AI
changed the title
[WIP] Bump go-ucfg dependency from 0.8.8 to 0.9.0
Run go mod tidy to resolve merge conflicts in dependency backport
Feb 18, 2026
Contributor
|
@copilot in the original PR, lines 122-129 in testing/go.mod contain a conflict. Fix it. |
Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com>
Contributor
Author
swiatekm
approved these changes
Feb 18, 2026
swiatekm
approved these changes
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.
This PR resolves merge conflicts in
go.mod,go.sum, andtesting/go.sumfor the backport of go-ucfg v0.9.0 to the 8.19 branch.Changes
go mod tidyto synchronize dependency checksums in both root and testing directoriestesting/go.sumat lines 122-129 by resolving oapi-codegen/runtime version conflictThe dependency updates themselves were already applied by the original backport; this PR ensures the module files are properly synchronized without conflict markers.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.