Resolving merge conflicts in go.sum
Posted on 30 Mar, 2022
Accept all the changes from any one branch (preferably the one you want to merge)
Re-download all dependencies via
go get -u .Run
go mod tidy
TODO
Since this can be a common thing among teams, best way to automate this would be to setup a post-merge git hook.
Last updated