3 ms·

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

• kibwen 8y ago
  In that scenario, you're going to get a merge conflict anyway in your manifest (e.g. in go.mod).
  • grahamedgecombe 8y ago
    It's probably easier to manually merge the manifest (as they're much more human-readable) than a lock file though.
    • steveklabnik 8y ago
      Lock files are easy enough to resolve that npm, in newer versions, will do it for you automatically, if you ask it to.
• Groxx 8y ago
  That's correct behavior though - you can't merge "upgrade A" and "upgrade B" in isolation with literally any confidence that it works.