Nп/п : 1 из 100
От : Dumas Walker 1:103/705 26 апр 24 09:38:17
К : All 26 апр 24 19:25:01
Тема :
----------------------------------------------------------------------------------
@MSGID: 70727.sync@723:320/1 2a9206a0
@TZUTC: -0500
@PID: Synchronet 3.20a-Linux master/95ae0137d Mar 1
2024 GCC 12.2.0
@TID: SBBSecho 3.20-Linux master/197f73515 Apr 22
2024 21:58 GCC 12.2.0
@BBSID: CAPCITY2
@CHRS: CP437 2
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
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
SEEN-BY: 50/109 103/705 124/5016 153/757 154/10 30
203/0 218/700 221/0
SEEN-BY: 240/1120 5832 280/464 5003 292/8125 301/1
310/31 341/66 234 396/45
SEEN-BY: 423/120 460/58 463/68 467/888 633/280
712/848 770/1 3634/12 5000/111
SEEN-BY: 5001/100 5005/49 5019/40 5020/400 715 848
1042 4441 12000 5030/49
SEEN-BY: 5030/1081 5054/8 5060/900 5061/133 5075/128
5083/444
@PATH: 103/705 280/464 467/888 5020/1042 4441