Read the statement by Michael Teeuw here.
package.json conflict
-
I have this error after rebooting my Raspberry Pi:
pi@rpi4:~/MagicMirror $ npm run start
npm ERR! code EJSONPARSE
npm ERR! path /home/pi/MagicMirror/package.json
npm ERR! Merge conflict detected in your package.json.
npm ERR!
npm ERR! Please resolve the package.json conflict and retry.npm ERR! A complete log of this run can be found in:
How do I determine what the conflict is?
-
@Redicaljk edit the file. there should be sections marked <<<<<<<<<<<
…
……
…which notes the outgoing (someone made them locally) and incoming (coming from an update) changes
-
@sdetweil thank you,
"optionalDependencies": { <<<<<<< Updated upstream "electron": "^19.1.0" ======= "electron": "^21.0.1" >>>>>>> Stashed changesHow should I edit this?
-
@Redicaljk which one is running?
do
grep version node_modules/electrondelete the section that doesn’t match
and remove the extra <<< or >>> rows
and the row of ====
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login