TZUTC: -0500   
   MSGID: 20028.fidonet_synchronet@1:135/205 2bdf6a08   
   PID: Synchronet 3.20b-Linux master/d7de4b882 Jan 03 2025 GCC 13.3.0   
   TID: SBBSecho 3.23-Linux master/d7de4b882 Jan 03 2025 GCC 13.3.0   
   BBSID: CWSHACK   
   CHRS: ASCII 1   
   NOTE: FSEditor.js v1.105   
   Hi,   
   Went to update my system this evening and this is what I got when running the   
   get pull command.   
      
   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.   
      
   Please advise where I should go from here.   
      
   Tom   
   --- SBBSecho 3.23-Linux   
    * Origin: Cw Shack Bbs telnet bbs.kf4yey.com port 2330 (1:135/205)   
   SEEN-BY: 1/120 10/0 1 18/0 102/401 103/1 17 705 104/119 105/81 106/201   
   SEEN-BY: 116/116 123/0 25 180 525 755 3001 3002 124/5016 128/187 129/215   
   SEEN-BY: 135/0 115 205 220 230 240 363 366 382 385 388 390 391 153/757   
   SEEN-BY: 153/7715 154/10 30 50 700 203/0 218/0 1 215 601 700 840 860   
   SEEN-BY: 218/880 220/6 20 90 221/0 6 222/2 226/18 30 44 50 227/114   
   SEEN-BY: 229/110 114 206 310 317 400 426 428 470 550 700 705 240/1120   
   SEEN-BY: 240/5832 250/1 266/512 275/1000 280/464 5003 5006 282/1038   
   SEEN-BY: 291/111 292/8125 301/1 310/31 320/219 322/757 341/66 234   
   SEEN-BY: 342/200 396/45 423/120 460/58 467/888 633/280 712/848 1321   
   SEEN-BY: 770/1 902/26 2320/105 3634/0 12 24 27 57 58 60 119 5020/400   
   SEEN-BY: 5075/35   
   PATH: 135/205 115 3634/12 154/10 280/464 103/705 218/700 229/426