News for hackers. Stuff that matters.

A comment on The vgo proposal is accepted. Now what?. Parent comment

Re:The vgo proposal is accepted. Now what? by blaisio on Tuesday May 29, 2018 @11:54PM (#17184927)
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.
[ Parent | on HN ]
Re:The vgo proposal is accepted. Now what? by kibwen on Wednesday May 30, 2018 @12:08AM (#17184998)
In that scenario, you're going to get a merge conflict anyway in your manifest (e.g. in go.mod).
[ Parent | on HN ]
Re:The vgo proposal is accepted. Now what? by grahamedgecombe on Wednesday May 30, 2018 @05:28AM (#17186300)
It's probably easier to manually merge the manifest (as they're much more human-readable) than a lock file though.
[ Parent | on HN ]
Re:The vgo proposal is accepted. Now what? by steveklabnik on Wednesday May 30, 2018 @05:55AM (#17186400)
Lock files are easy enough to resolve that npm, in newer versions, will do it for you automatically, if you ask it to.
[ Parent | on HN ]
Re:The vgo proposal is accepted. Now what? by Groxx on Wednesday May 30, 2018 @06:51PM (#17192585)
That's correct behavior though - you can't merge "upgrade A" and "upgrade B" in isolation with literally any confidence that it works.
[ Parent | on HN ]