2 ms·
In that scenario, you're going to get a merge conflict anyway in your manifest (e.g. in go.mod).
by 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 agoIt's probably easier to manually merge the manifest (as they're much more human-readable) than a lock file though.
- steveklabnik 8y agoLock files are easy enough to resolve that npm, in newer versions, will do it for you automatically, if you ask it to.