Resolve merge conflicts for removed /samples/industrial-data-simulator dependency bump#57
Closed
dependabot[bot] wants to merge 2 commits into
Conversation
Bumps [github.com/gofiber/fiber/v2](https://github.com/gofiber/fiber) from 2.50.0 to 2.52.1. - [Release notes](https://github.com/gofiber/fiber/releases) - [Commits](gofiber/fiber@v2.50.0...v2.52.1) --- updated-dependencies: - dependency-name: github.com/gofiber/fiber/v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
Bot
added
dependencies
Member
|
@copilot resolve the merge conflicts in this pull request |
…/samples/industrial-data-simulator/github.com/gofiber/fiber/v2-2.52.1 # Conflicts: # samples/industrial-data-simulator/go.mod # samples/industrial-data-simulator/go.sum
Copilot
AI
changed the title
Bump github.com/gofiber/fiber/v2 from 2.50.0 to 2.52.1 in /samples/industrial-data-simulator
Resolve merge conflicts for removed /samples/industrial-data-simulator dependency bump
Jun 18, 2026
Contributor
Author
|
OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
dependabot
Bot
deleted the
dependabot/go_modules/samples/industrial-data-simulator/github.com/gofiber/fiber/v2-2.52.1
branch
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.
The merge conflicts in this pull request have been resolved.
The upstream
mainbranch removed/samples/industrial-data-simulator, so the original dependency bump for github.com/gofiber/fiber/v2 no longer applies after merging the latest base branch changes.This update preserves the upstream removal and resolves the conflicting changes accordingly.