tickets #162470
closedFwd: Cron <web_static@narwal5> /home/web_static/bin/fetch_and_rsync_static
0%
Description
-------- Forwarded Message --------
Subject: Cron
/home/web_static/bin/fetch_and_rsync_static
Date: Tue, 18 Jun 2024 19:00:07 +0000 (UTC)
From: (Cron Daemon)
To: admin-auto@opensuse.org
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: hint: git config pull.rebase false # merge
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.
fatal: Need to specify how to reconcile divergent branches.
git failure for ignite.opensuse.org
Updated by cboltz 10 days ago
- Status changed from New to Resolved
I can only guess that someone did a force push :-/
web_static@narwal5:~/git/ignite.opensuse.org> git status
On branch gh-pages
Your branch and 'origin/gh-pages' have diverged, <------------
and have 1 and 1 different commits each, respectively. <------------
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
web_static@narwal5:~/git/ignite.opensuse.org> git reset --hard HEAD^
HEAD is now at 3c02516 Merge pull request #15 from schubi2/add_hostname
web_static@narwal5:~/git/ignite.opensuse.org> git pull
Updating 3c02516..e0fdd3e
-> fixed