Skip to content

problem with updates #65

Description

@sllllr

i have this error after... updaes :) i run it on my seedbox in hosted by design (appslot).

git -C $HOME/scripts/hosted-scripts pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 0e5aadd..4fee715
error: Your local changes to the following files would be overwritten by merge:
qui.sh
seerr.sh
Please commit your changes or stash them before you merge.
Aborting

i run

git stash
Saved working directory and index state WIP on master: 0e5aadd feat(seer): delete overseerr

and again command to update and i have:

git -C $HOME/scripts/hosted-scripts pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 0e5aadd..4fee715
Fast-forward
audiobookshelf.sh | 0
channels-dvr.sh | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
cloudflared.sh | 0
microsocks.sh | 0
qui.sh | 4 ++--
seerr.sh | 2 +-
tailscale.sh | 0
7 files changed, 103 insertions(+), 3 deletions(-)
mode change 100644 => 100755 audiobookshelf.sh
create mode 100755 channels-dvr.sh
mode change 100644 => 100755 cloudflared.sh
mode change 100644 => 100755 microsocks.sh
mode change 100644 => 100755 qui.sh
mode change 100644 => 100755 seerr.sh
mode change 100644 => 100755 tailscale.sh

seerr version still 2.7.3 how to upgrade to latest (3.3.0) ?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions