Today I Learned
Resolving merge conflicts in go.sum
Posted on 30 Mar, 2022
  1. 1.
    Accept all the changes from any one branch (preferably the one you want to merge)
  2. 2.
    Re-download all dependencies via go get -u .
  3. 3.
    Run go mod tidy


Since this can be a common thing among teams, best way to automate this would be to setup a post-merge git hook.
Copy link
Edit on GitHub