open https://gitlab.synchro.net/main/sbbs/-/issues/231

Getting this message when cloning the repo for the "Updating" section of the UNIX install (http://wiki.synchro.net/install:nix?s[]=unix&s[]=install):git -C /sbbs/repo pullwarning: Pulling without specifying how to reconcile divergent branches isdiscouraged. You can squelch this message by running one of the followingcommands sometime before your next pull: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward onlyYou can replace "git config" with "git config --global" to set a defaultpreference for all repositories. You can also pass --rebase, --no-rebase,or --ff-only on the command line to override the configured default perinvocation.**Updating d81f6e819..8e2066a66error: Your local changes to the following files would be overwritten by merge: xtrn/lord2/world.datPlease commit your changes or stash them before you merge.Aborting**If I do a "git reset --hard", that gets rid of the error, however deuce says that will reset the LORD2 world:<@Deuce> No, the issue was in how you installed LORD2, not how you installed Synchronet.<Keyop> Ah - I did the "auto install new external programs" from the operator external menu....<Keyop> ... and the "legend of the Red Dragon - Configure" from the same menu<Keyop> ... all after the SBBS install<@Deuce> Ah, I have no idea how that works or what it does... I think DigitalMan may be able to help with that though, I think he created the install file for LORD2.<Keyop> I ended up doing a git reset --hard which got rid of any suggested "commits" and then the upgrade went ok<@Deuce> Yeah, but now your LORD2 world has been reset.Please let me know if any additional information is required.
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

Re: Error when git cloning synchronet repo
By: Keyop Troy to GitLab issue in main/sbbs on Fri Mar 05 2021 12:08 pm

open https://gitlab.synchro.net/main/sbbs/-/issues/231

Getting this message when cloning the repo for the "Updating" section of the UNIX install (http://wiki.synchro.net/install:nix?s[]=unix&s[]=install):

git -C /sbbs/repo pull
warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull:

git config pull.rebase false # merge (the default strategy)
git config pull.rebase true # rebase
git config pull.ff only # fast-forward only

You can replace "git config" with "git config --global" to set a default preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per invocation.

**Updating d81f6e819..8e2066a66
error: Your local changes to the following files would be overwritten by merge:
xtrn/lord2/world.dat
Please commit your changes or stash them before you merge.
Aborting**

If I do a "git reset --hard", that gets rid of the error, however deuce says that will reset the LORD2 world:

<@Deuce> No, the issue was in how you installed LORD2, not how you installed Synchronet.
<Keyop> Ah - I did the "auto install new external programs" from the operator external menu....

Yeah, Deuce is talking about the method of getting lord2 from the repo and into your xtrn directory. If you have symlinked your entire xtrn directory from the repo to your BBS's xtrn directory, then that's the "how you installed" that Deuce is referring to.

<Keyop> ... and the "legend of the Red Dragon - Configure" from the same menu <Keyop> ... all after the SBBS install
<@Deuce> Ah, I have no idea how that works or what it does... I think DigitalMan may be able to help with that though, I think he created the install file for LORD2.

The install file isn't the issue.

<Keyop> I ended up doing a git reset --hard which got rid of any suggested "commits" and then the upgrade went ok
<@Deuce> Yeah, but now your LORD2 world has been reset.

Please let me know if any additional information is required.

If you don't mind your LORD2 install being reset, then you're fine. Otherwise, you can "git stash" your local changes (e.g. to world.dat) before your run "git pull" and then "git stash pop" to restore your changes (and hope they merge successfully).
--
digital man

This Is Spinal Tap quote #30:
Big bottom, big bottom / Talk about mud flaps, my girl's got 'em!
Norco, CA WX: 78.4øF, 21.0% humidity, 0 mph W wind, 0.00 inches rain/24hrs
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

Re: Error when git cloning synchronet repo
By: Digital Man to Keyop Troy on Fri Mar 05 2021 12:46:25

If you don't mind your LORD2 install being reset, then you're fine. Otherwise, you can "git stash" your local changes (e.g. to world.dat) before your run "git pull" and then "git stash pop" to restore your
changes (and hope they merge successfully).

Hi DM, thanks for the reply. Noted for next time I do a future rebuild.

I wonder if I could restore that file from the backup I did just before I did the git reset --hard ...

---
þ Synchronet þ >>> Magnum BBS <<< - bbs.magnum.uk.net
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

https://gitlab.synchro.net/main/sbbs/-/issues/231#note_1681

DigitalMan has provided guidance via Synchronet forum.
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

close https://gitlab.synchro.net/main/sbbs/-/issues/231
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

reopen https://gitlab.synchro.net/main/sbbs/-/issues/231

Getting this message when cloning the repo for the "Updating" section of the UNIX install (http://wiki.synchro.net/install:nix?s[]=unix&s[]=install):git -C /sbbs/repo pullwarning: Pulling without specifying how to reconcile divergent branches isdiscouraged. You can squelch this message by running one of the followingcommands sometime before your next pull: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward onlyYou can replace "git config" with "git config --global" to set a defaultpreference for all repositories. You can also pass --rebase, --no-rebase,or --ff-only on the command line to override the configured default perinvocation.**Updating d81f6e819..8e2066a66error: Your local changes to the following files would be overwritten by merge: xtrn/lord2/world.datPlease commit your changes or stash them before you merge.Aborting**If I do a "git reset --hard", that gets rid of the error, however deuce says that will reset the LORD2 world:<@Deuce> No, the issue was in how you installed LORD2, not how you installed Synchronet.<Keyop> Ah - I did the "auto install new external programs" from the operator external menu....<Keyop> ... and the "legend of the Red Dragon - Configure" from the same menu<Keyop> ... all after the SBBS install<@Deuce> Ah, I have no idea how that works or what it does... I think DigitalMan may be able to help with that though, I think he created the install file for LORD2.<Keyop> I ended up doing a git reset --hard which got rid of any suggested "commits" and then the upgrade went ok<@Deuce> Yeah, but now your LORD2 world has been reset.Please let me know if any additional information is required.
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

https://gitlab.synchro.net/main/sbbs/-/issues/231#note_1682

I agree there is an issue here for sysops that use the *nix install/GNUmakefile method with symlinks. Since *some* xtrn/* "doors" include game data in the git repo, those directories or files should not be symlinked to the repo. Still pondering the best solution.
--- SBBSecho 3.13-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)

https://gitlab.synchro.net/main/sbbs/-/issues/231#note_2015

'git pull --autostash' should address this problem.
--- SBBSecho 3.14-Linux
* Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)