Having issues updating, I tried to pull any changes and got the message:

```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 (the default strategy)
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.```

Status output:
```
sbbs@xercies:/sbbs/repo$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 6239 and 6462 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: dosemu.ini
modified: external.bat
modified: sbbsexec.ini
modified: ../text/answer.msg
modified: ../text/banner1.msg
modified: ../text/banner2.msg
modified: ../text/banner3.msg
modified: ../text/menu/chat.msg
modified: ../text/menu/e-mail.msg
modified: ../text/menu/mailread.msg
modified: ../text/menu/multchat.msg
modified: ../text/menu/qwk.msg
modified: ../text/menu/sysmailr.msg
modified: ../text/menu/tempxfer.asc
modified: ../text/menu/xfercfg.msg
modified: ../xtrn/bullshit/bullshit.ini
modified: ../xtrn/lord2/world.dat
modified: ../xtrn/oneliners/settings.ini
modified: ../xtrn/war/warpoll.js
```
..
I have made some minor dosemu changes which I assume this refers too, I didn't think I changed the rest, but I may have.

Got a backup before all this, so no big deal. Can someone help me out as someone who only tinkers/understands git? I sort of feel like I have to stash the changes, pull then pop the stuff I stashed back out after everything is verified working.

Let me know if I'm on the right track,
-A.

---
* Synchronet * Shodan's Core @ ShodansCore.com
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

Re: updating from git issues
By: Android8675 to All on Fri Apr 05 2024 10:30 am

Having issues updating, I tried to pull any changes and got the message:

```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

Does a 'git pull --rebase' work?

There are more Git tips and tricks here:
https://wiki.synchro.net/howto:git
--
digital man (rob)

Synchronet "Real Fact" #81:
Vertrauen has had the FidoNet node number 1:103/705 since 1992
Norco, CA WX: 55.2oF, 56.0% humidity, 3 mph SSW wind, 0.12 inches rain/24hrs --- SBBSecho 3.20-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)