UNSOLVED error: Pulling is not possible because you have unmerged files.
-
@DazTypeR cool, can u try that one more time (without apply) to see if I fixed the line 159 problem
-
Just ran it again without the extra logging and a block of the output shows this…
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 159: On branch master: command not found
there are 28 local files that are different than the master repo -
@DazTypeR can I beg one more try?
-
saving custom.css
upgrading from version 2.9.0 to 2.9.0
fetching latest revisions
bash: line 154: [: missing `]’
MagicMirror git fetch failed
restoring custom.css -
@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?
