Error when git cloning synchronet repo
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 d81f6e81..8e2066a6 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. Ah - I did the "auto install new external programs" from the operator external menu.... ... and the "legend of the Red Dragon - Configure" from the same menu ... 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. 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.