Hacker News Reader

It's pretty easy to get a merge conflict from a lock file. If two developers add a dependency and then try to merge their changes together, it can happen easily.

View on HN

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.

That's correct behavior though - you can't merge "upgrade A" and "upgrade B" in isolation with literally any confidence that it works.

Reply on news.ycombinator.com