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)
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

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 ---
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

I recommend: git config pull.rebase true

Hi,
Ran the command you suggested and got the following:
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them

Tom
--- SBBSecho 3.23-Linux
* Origin: Cw Shack Bbs telnet bbs.kf4yey.com port 2330 (1:135/205)
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

Re: Can't Update from Git
By: Tom Moore to Digital Man on Sat Jan 04 2025 09:46 pm

Howdy,

Ran the command you suggested and got the following:
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them

Does "git pull --autostash" fix it for you?


...ëîåï

---
þ Synchronet þ AnsiTEX bringing back videotex but with ANSI

Re: Can't Update from Git
By: Tom Moore to Digital Man on Sat Jan 04 2025 09:46 pm

I recommend: git config pull.rebase true

Hi,
Ran the command you suggested and got the following:
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them

So add --autostash to your pull command-line, or define/use an "up" alias, as I do:

https://wiki.synchro.net/howto:git#up_alias

It might be important to know what files you have changed, 'git status' will report that. And then if they're unexpectedly changed, you can 'git checkout' the file(s) to overwrite with the version(s) in the repo. But knowing which files and why they were changed can be important.
--
digital man (rob)

Synchronet "Real Fact" #43:
Synchronet added Baja/PCMS support with v2.00a (1994)
Norco, CA WX: 54.6øF, 65.0% humidity, 0 mph NNW wind, 0.00 inches rain/24hrs ---
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net