Read the statement by Michael Teeuw here.
error: Pulling is not possible because you have unmerged files.
-
@DazTypeR one last time
-
Nearly…
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 161: On branch master: command not found
there are 28 local files that are different than the master repo -
@DazTypeR ok, last time… hard to see the side effects
$(git status 2>&1) >>$logfilethat means execute the git status command , and THEN execute the results of THAT , and pass THOSE results to the log
what I wanted was
git status 2>&1 >>$logfileexec the git status command, and pass ITS results to the log
-
OK nice one, that has come back with no errors or anything. :)
Guessing I am correct in replying N to the question regarding lock.json files needed to be saved, I have no idea if I need them or not - lol?
-
@DazTypeR u should have seen a message
any *-lock.json files do not need to be saved -
Of course, sorry, my bad, I did read that.
So am I OK to run this now with the apply option and it should update me to 2.9.0?
Also, on the slim chance this mucks up, I backed up my SD card prioe to doing all this, guess I will be OK to just reflash the card with that backup image?
-
@DazTypeR yes, go ahead… good strategy. backup… never hurts…
thanks for all your help !!
my main computer boot drive is starting to fail…
time for a hard drive switch later today!
-
OK, so I ran the script with the apply option and it said something about the versions are the same and just finished.
Did all the test we do earlier pull down version 2.9.0 and that is what your installer is seeing?
Just rebooted the Pi in case and when the Magic Mirror booted up it still said there was an update needed.
-
@DazTypeR change apply to force
this was in case u had some failure part way thru…and had to restart
-
OK done that, it ran, threw out no errors that I could see, so rebooted the Pi using sudo reboot and it all booted back up OK but the Magic Mirror still says there is an update?
