/ go Public
cmd/go: mitigate merge conflicts when modules are updated #32485
Someone must examine and confirm this is a valid issue and not a duplicate of an existing one.
I expect merge conflicts in
go.sumto be a relatively common occurrence.
Quoting from @bcmills in the Go Slack:
This doesn't appear terribly burdensome but it does introduce friction in the development process. I'm opening this as an exploratory issue to investigate whether there's anything the tooling can/should do to mitigate the conflict.
My off the cuff question was whether
go mod tidycould be updated to understand conflicts and automatically resolve them in
go.sum. My summary of the resulting conversation is that it's likely possible but it's unclear whether it's desirable.
Some of the reasons against that were brought up:
It's possible there's a less invasive approach to mitigating conflicts so I'm including the above suggestion only as one potential option to explore.
The text was updated successfully, but these errors were encountered: