I’ve messed up my magic mirror

[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