TZUTC: -0800   
   MSGID: 53370.sync@1:103/705 2bdff378   
   REPLY: 20028.fidonet_synchronet@1:135/205 2bdf6a08   
   PID: Synchronet 3.20b-Linux master/d7de4b882 Jan 03 2025 GCC 12.2.0   
   TID: SBBSecho 3.23-Linux master/d7de4b882 Jan 03 2025 GCC 12.2.0   
   COLS: 80   
   BBSID: VERT   
   CHRS: CP437 2   
   NOTE: FSEditor.js v1.105   
     Re: Can't Update from Git   
     By: Tom Moore to All on Sat Jan 04 2025 08:52 pm   
      
    > 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.   
      
   I recommend: git config pull.rebase true   
   --    
                                               digital man (rob)   
      
   Breaking Bad quote #30:   
   Damn, chick's got an ass like an onion - makes me want to cry. - Hank Schrader   
   Norco, CA WX: 55.7øF, 64.0% humidity, 0 mph NNW wind, 0.00 inches rain/24hrs   
   --- SBBSecho 3.23-Linux   
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)   
   SEEN-BY: 10/0 1 102/401 103/1 17 705 105/81 106/201 124/5016 128/187   
   SEEN-BY: 153/7715 218/0 1 215 601 700 840 860 880 226/30 227/114 229/110   
   SEEN-BY: 229/114 206 317 400 426 428 470 550 700 705 266/512 280/464   
   SEEN-BY: 282/1038 291/111 301/1 320/219 322/757 342/200 396/45 460/58   
   SEEN-BY: 633/280 712/848 902/26 5075/35   
   PATH: 103/705 218/700 229/426