Closed vladikoff closed 5 years ago
This change causes us to go back to this situation:
error: Your local changes to the following files would be overwritten by merge:
npm-shrinkwrap.json
Please commit your changes or stash them before you merge.
Aborting
@stomlinson, yeah but this the same for all files, it's like a safeguard to avoid losing work
Fixes #124