• From Oli@VERT to Terry Roati on Saturday, January 16, 2021 15:31:59
    Terry, it seems you tosser replaced the 0:0/0 in a mail with your own address, added an Orgin line an created a dupe out of an mostly empty/useless/corrupt mail.

    16 Jan 21 03:10, you wrote to Al:

    * Origin: kakistocracy (2:280/464.47)

    ---
    þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net
  • From Dumas Walker@VERT/CAPCITY2 to All on Friday, April 26, 2024 09:38:17
    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.

    Thanks.
    $$
    ---
    þ Synchronet þ CAPCITY2 * capcity2.synchro.net * Telnet/SSH:2022/Rlogin/HTTP