How to resolve merge conflicts in go.sum

It is safe to keep rows from both versions. Gabriel’s article contains instructions how to configure Git to do that automatically.

The crux is to put the following line into your .gitattributes file:

go.sum merge=union

After a successful merge, it is recommended to clean the go.sum file using go mod tidy.