I’ve messed up my magic mirror

richardh151

Help needed as I have got my mirror into a state I can not resolve myself. The more I mess the worse it gets and all I wanted to do was update the version.

The error messages are below. Please can someone specify exactly what I need to do as I’m lost and I’ve searched through the forum for the last 2 days and cannot fix it myself.

package-lock.json: needs merge
package-lock.json: needs merge
package-lock.json: unmerged (15a6644aa9176c5f2eca406eee6408b0b09af316)
package-lock.json: unmerged (0eae738f8fb92056a77e25451c0f257056693a24)
package-lock.json: unmerged (01c38c4d386176495fbc2987c69cbbbc575e3e69)
fatal: git-write-tree: error building trees
Cannot save the current index state

Thanks in advance for any support.

sdetweil

@richardh151 google search says

git checkout --conflict=merge – path/to/file

so

git checkout --conflict=merge – package-lock.json
| edit, fix filename typo

richardh151

@sdetweil

I just tried that but it states fatal: unknown style “merge-path/to/file”

sdetweil

@richardh151 the 1st one is the instructions on how to do it, the second one is the one you need

sdetweil

@richardh151 said in I’ve messed up my magic mirror:

merge-path/to/file

also, don’t remove the spaces, they are important

richardh151

@sdetweil
It states I need to resolve my current index first.

sdetweil

@richardh151 i don’t know for sure

try

git reset -–merge

ps. I am just google searching on the error u got…

richardh151

@sdetweil Thanks Sam for your support. When I eventually resolved one error I had others appear so I completely re-installed magic mirror and now all is good

sdetweil

@richardh151 great… thanks for the feedback, glad u got it working

just for info, did you use the automated installer?
https://github.com/sdetweil/MagicMirror_scripts