Hacker News Reader

In that scenario, you're going to get a merge conflict anyway in your manifest (e.g. in go.mod).

It's probably easier to manually merge the manifest (as they're much more human-readable) than a lock file though.

Lock files are easy enough to resolve that npm, in newer versions, will do it for you automatically, if you ask it to.