Skip to content

Resolve merge conflicts in go.mod/go.sum for go-ucfg 0.9.0 backport#6381

Merged
swiatekm merged 2 commits intomergify/bp/8.19/pr-6377from
copilot/sub-pr-6378
Feb 18, 2026
Merged

Resolve merge conflicts in go.mod/go.sum for go-ucfg 0.9.0 backport#6381
swiatekm merged 2 commits intomergify/bp/8.19/pr-6377from
copilot/sub-pr-6378

Conversation

Copy link
Contributor

Copilot AI commented Feb 18, 2026

Backport PR had merge conflicts in go.mod and go.sum preventing the go-ucfg upgrade from 0.8.8 to 0.9.0.

Changes

  • Resolved merge conflicts by accepting incoming dependency versions:
    • github.com/elastic/go-ucfg: 0.8.8 → 0.9.0
    • github.com/fxamacker/cbor/v2: 2.8.0 → 2.9.0
  • Ran go mod tidy to resolve transitive dependencies for 8.19 branch
    • Kept go-sysinfo v1.15.0 and oapi-codegen/runtime v1.1.1 (correct for this branch)

💡 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.

Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com>
Copilot AI changed the title [WIP] Update go-ucfg dependency to version 0.9.0 Resolve merge conflicts in go.mod/go.sum for go-ucfg 0.9.0 backport Feb 18, 2026
Copilot AI requested a review from swiatekm February 18, 2026 12:50
@swiatekm swiatekm marked this pull request as ready for review February 18, 2026 13:06
@swiatekm swiatekm requested a review from a team as a code owner February 18, 2026 13:06
@swiatekm swiatekm requested review from ycombinator and removed request for a team February 18, 2026 13:06
@swiatekm swiatekm merged commit 66939bc into mergify/bp/8.19/pr-6377 Feb 18, 2026
9 checks passed
@swiatekm swiatekm deleted the copilot/sub-pr-6378 branch February 18, 2026 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants