Skip to content

Commit

Permalink
Fix update for mac instruction
Browse files Browse the repository at this point in the history
  • Loading branch information
Cohee1207 committed Aug 5, 2024
1 parent acd7907 commit 7001a4b
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions Usage/update.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 7001a4b

Please sign in to comment.