Accept go.sum files with git conflict markers#2225
Merged
Conversation
tyler-french
approved these changes
Nov 12, 2025
jayconrod
approved these changes
Nov 17, 2025
7e83faa to
692bdd1
Compare
Also tell users how to avoid these conflicts in the first place.
692bdd1 to
e512bb9
Compare
pcj
pushed a commit
to stackb/bazel-gazelle
that referenced
this pull request
Dec 23, 2025
**What type of PR is this?** Feature **What package or component does this PR mostly affect?** `go_deps` **What does this PR do? Why is it needed?** **Which issues(s) does this PR fix?** Fixes bazel-contrib/rules_go#4505 **Other notes for review**
Closed
4 tasks
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
3 participants
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.
What type of PR is this?
Feature
What package or component does this PR mostly affect?
go_depsWhat does this PR do? Why is it needed?
Which issues(s) does this PR fix?
Fixes bazel-contrib/rules_go#4505
Other notes for review