Resolve go.mod merge conflict in go-ucfg backport to 9.2#6382
Merged
swiatekm merged 2 commits intomergify/bp/9.2/pr-6377from Feb 18, 2026
Merged
Resolve go.mod merge conflict in go-ucfg backport to 9.2#6382swiatekm merged 2 commits intomergify/bp/9.2/pr-6377from
swiatekm merged 2 commits intomergify/bp/9.2/pr-6377from
Conversation
Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Bump go-ucfg from 0.8.8 to 0.9.0
Resolve go.mod merge conflict in go-ucfg backport to 9.2
Feb 18, 2026
swiatekm
requested review from
michel-laterman
and removed request for
a team
swiatekm
added a commit
that referenced
this pull request
Feb 18, 2026
…om 0.8.8 to 0.9.0 (#6379) * build(deps): bump github.com/elastic/go-ucfg from 0.8.8 to 0.9.0 (#6377) * build(deps): bump github.com/elastic/go-ucfg from 0.8.8 to 0.9.0 Bumps [github.com/elastic/go-ucfg](https://github.com/elastic/go-ucfg) from 0.8.8 to 0.9.0. - [Release notes](https://github.com/elastic/go-ucfg/releases) - [Changelog](https://github.com/elastic/go-ucfg/blob/main/CHANGELOG.md) - [Commits](elastic/go-ucfg@v0.8.8...v0.9.0) --- updated-dependencies: - dependency-name: github.com/elastic/go-ucfg dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Post dependabot file modifications --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6073d17) # Conflicts: # go.mod * Resolve go.mod merge conflict in go-ucfg backport to 9.2 (#6382) * Initial plan * Resolve go.mod merge conflict for go-ucfg update Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: swiatekm <93588780+swiatekm@users.noreply.github.com> --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: swiatekm <93588780+swiatekm@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.
This backport PR had a merge conflict in
go.moddue to divergent dependency versions between the main branch (where #6377 originated) and the 9.2 branch.Changes
go-ucfg v0.9.0(from the backport) andgo-elasticsearch/v8 v8.19.2(from 9.2 base branch)go mod tidyto ensure consistencyThe conflict arose because:
go-elasticsearch/v8 v8.19.2,go-ucfg v0.8.8go-elasticsearch/v8 v8.19.3,go-ucfg v0.9.0Resolution keeps the go-elasticsearch version already in 9.2 while applying the go-ucfg update that this backport intends to deliver.
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.