-
From
@1:3634/12 to
Al on Saturday, January 16, 2021 03:10:00
SEEN-BY: 1/17 100/22 19/36 37 2/105 220/70 221/0 226/17 261/38 267/800 280/464 SEEN-BY: 300/0 1 317/3 340/1000 3634/12 411/36 500/8 57/0 633/267 280 640/1138 SEEN-BY: 640/1321 1384 712/620 848 770/0 1 100 330 340 772/0 1 220 230 116/116 SEEN-BY: 123/25 150 755 135/300 153/7715 154/10 261/38 3634/15 24 27 50 119 SEEN-BY: 123/50 115 300/4 123/170 257 180 40 299/6 123/35 3634/12 0 18/0 123/0 SEEN-BY: 1/120
-
From
@1:3634/12 to
Al on Saturday, January 16, 2021 03:10:00
SEEN-BY: 15/0 19/36 106/201 116/18 120/302 331 123/140 153/7715 218/700 SEEN-BY: 230/150 152 240/1120 250/1 261/38 100 266/512 267/155 275/100
SEEN-BY: 282/1031 1056 291/100 111 320/119 219 340/400 341/66 396/45 640/1321 SEEN-BY: 712/848 801/161 189 2320/105 3634/12 5020/1042 116/116 123/25 150 755 SEEN-BY: 135/300 154/10 3634/15 24 27 50 119 640/1384 123/50 115 300/4 123/170 SEEN-BY: 123/257 180 40 299/6 123/35 3634/0 18/0 123/0 1/120
-
From
Oli@2:280/464.47 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)
-
From
Dumas Walker@1:103/705 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
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)