Subj :
To : All
From : Dumas Walker
Date : Fri Apr 26 2024 09:38 am
I last pulled and compiled 3.20 in February. Today, when doing so based on a
recommendation about some silly upside-down ! display error, I got the
following error:
git -C /sbbs/repo pull
[...]
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.
Needless to say I have no idea what to do here. I am guessing something
changed on the site since February.
