Subj : Can't Update from Git
To   : Tom Moore
From : Digital Man
Date : Sat Jan 04 2025 18:22:54

  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)

.