From 7001a4bf6188bd39e4dd8145ac8904ce1e7f04c5 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Tue, 6 Aug 2024 00:52:20 +0300 Subject: [PATCH] Fix update for mac instruction --- Usage/update.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Usage/update.md b/Usage/update.md index 37206bd77..c6c1002d8 100644 --- a/Usage/update.md +++ b/Usage/update.md @@ -13,7 +13,7 @@ This is not an installation guide. If you need installation instructions, go to ---- -## Linux/Termux +## Linux/Termux or MacOS You definitely installed via git, so just 'git pull' inside the SillyTavern directory. @@ -23,7 +23,7 @@ You definitely installed via git, so just 'git pull' inside the SillyTavern dire ---- -## Windows/MacOS +## Windows >First try using the `UpdateAndStart.bat` which is located in your SillyTavern installation base folder. @@ -105,13 +105,14 @@ secrets.json <---- this one is in the base folder, not /public/ 9. If everything shows up, you can safely delete the old ST folder. ### Common Update Problems + #### "There are unresolved conflicts in the working directory." This means that you've modified default files that have been changed in the remote repository (such as setting presets). To fix this, run this in the terminal. Use cautiously, as it can be destructive. Make sure to have a backup if needed. -``` +```bash git merge --abort git reset --hard git pull --rebase --autostash @@ -132,14 +133,16 @@ git pull --rebase --autostash - Didn't help? Remove the node_modules folder **Windows** -``` + +```bash rmdir /s /q node_modules npm cache clean --force npm install ``` **Unix/Linux** -``` + +```bash rm -rf node_modules npm cache clean --force npm install