You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
branch master -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
pistar-upnp.service
Please commit your changes or stash them before you merge.
Aborting
Updating ad2da0d..57b5de5
Updates were not successfull, reverting to Pi-Star original files...
error: Entry 'pistar-upnp.service' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'origin/master'.
Done
The text was updated successfully, but these errors were encountered:
I also had this issue but it appeared to be transient, git status and git diff within /usr/local/sbin both reported no changes, and the directory appeared to have fast-forwarded correctly. Re-running the update reported no changes. Seems safe to ignore.
Run update from the web interface....
Updating Pi-Star Binaries...
Updating /usr/local/sbin...
From https://github.com/AndyTaylorTweet/Pi-Star_Binaries_sbin
error: Your local changes to the following files would be overwritten by merge:
pistar-upnp.service
Please commit your changes or stash them before you merge.
Aborting
Updating ad2da0d..57b5de5
Updates were not successfull, reverting to Pi-Star original files...
error: Entry 'pistar-upnp.service' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'origin/master'.
Done
The text was updated successfully, but these errors were encountered: