Read the statement by Michael Teeuw here.
I’ve messed up my magic mirror
-
@richardh151 google search says
git checkout --conflict=merge – path/to/file
so
git checkout --conflict=merge – package-lock.json
| edit, fix filename typo -
I just tried that but it states fatal: unknown style “merge-path/to/file”
-
@richardh151 the 1st one is the instructions on how to do it, the second one is the one you need
-
@richardh151 said in I’ve messed up my magic mirror:
merge-path/to/file
also, don’t remove the spaces, they are important
-
@sdetweil
It states I need to resolve my current index first. -
@richardh151 i don’t know for sure
try
git reset -–merge
ps. I am just google searching on the error u got…
-
@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
-
@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
