Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pistar-upnp.service failed for 57b5de5 #42

Open
mtdew365 opened this issue Jul 7, 2020 · 1 comment
Open

Update pistar-upnp.service failed for 57b5de5 #42

mtdew365 opened this issue Jul 7, 2020 · 1 comment

Comments

@mtdew365
Copy link

mtdew365 commented Jul 7, 2020

Run update from the web interface....

Updating Pi-Star Binaries...
Updating /usr/local/sbin...
From https://github.com/AndyTaylorTweet/Pi-Star_Binaries_sbin

  • 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
@mcoms
Copy link

mcoms commented Oct 27, 2021

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants