I think I need a little GitHub help.
Just updated from 2.18 to 2.19 using the updater script, and accepted the stashing of a couple of files (including package.json iirc) and then selected unstashing at the end.
But after reboot I just go to the Pi desktop rather than the mirror, and the logs have this in them:
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:
npm ERR! /home/pi/.npm/_logs/2022-04-02T09_27_46_355Z-debug-0.log
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:
npm ERR! /home/pi/.npm/_logs/2022-04-02T09_27_48_900Z-debug-0.log
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.
How do I resolve that conflict? If I try to move package.json away and git pull I get
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
My GitHub-fu is not strong enough to know how to resolve this one. Can someone assist in what commands I need?
The git stash is
fonts/package-lock.json | 26 -
modules/default/weatherforecast/weatherforecast.js | 2 +-
package-lock.json | 15293 ------------------------------------------------------------------------------------------------
package.json | 1 +
vendor/package-lock.json | 154 -
5 files changed, 2 insertions(+), 15474 deletions(-)