Subj : Can't Update from Git
To   : All
From : Tom Moore
Date : 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.

Tom
--- SBBSecho 3.23-Linux
* Origin: Cw Shack Bbs telnet bbs.kf4yey.com port 2330 (1:135/205)

You are viewing proxied material from cvs.synchro.net. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.