[GH-ISSUE #123] [BUG] Launcher cannot update because of nonexistent change to package-lock.json #64

New issue

Closed

opened 2026-10-15 18:06:41 +00:00 by bsakaguchi · 2 comments

bsakaguchi commented

2026-10-15 18:06:41 +00:00

Owner

Originally created by @BrendanMcCauley on GitHub (Dec 7, 2025).
Original GitHub issue: https://github.com/SillyTavern/SillyTavern-Launcher/issues/123

Environment

🪟 Windows

System

Version 25H2

Describe the problem

When I try the default Update & Start SillyTavern, I see:

[INFO] Updating SillyTavern...
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please commit your changes or stash them before you merge.
Aborting
Updating 765c76ea8..fbf789fa7

When I run git status on the repository, I see:

$ git status
On branch main
Your branch is up to date with 'origin/main'.

nothing to commit, working tree clean

These cannot both be right.

Additional info

No response

Please tick the boxes

I have explained the issue clearly, and I included all relevant info
I have checked that this issue hasn't already been raised
I have checked the docs

Originally created by @BrendanMcCauley on GitHub (Dec 7, 2025). Original GitHub issue: https://github.com/SillyTavern/SillyTavern-Launcher/issues/123 ### Environment 🪟 Windows ### System Version 25H2 ### Describe the problem When I try the default Update & Start SillyTavern, I see: [INFO] Updating SillyTavern... error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting Updating 765c76ea8..fbf789fa7 When I run git status on the repository, I see: $ git status On branch main Your branch is up to date with 'origin/main'. nothing to commit, working tree clean These cannot both be right. ### Additional info _No response_ ### Please tick the boxes - [x] I have explained the issue clearly, and I included all relevant info - [x] I have checked that this [issue hasn't already been raised](https://github.com/SillyTavern/SillyTavern/issues?q=is%3Aissue) - [x] I have checked the [docs](https://docs.sillytavern.app/) ![important](https://img.shields.io/badge/Important!-F6094E)

bsakaguchi

2026-10-15 18:06:41 +00:00

closed this issue
added the
🐛Bug

🪟 Windows
labels

bsakaguchi commented

2026-10-15 18:06:42 +00:00

Author

Owner

@Cohee1207 commented on GitHub (Dec 7, 2025):

You can fix this easily inside the launcher:
Go to 7. Troubleshooting & Support
Run 4. Fix unresolved conflicts or unmerged files [SillyTavern]

You should now be able to launch SillyTavern normally with: 1. Update & Start SillyTavern

@Cohee1207 commented on GitHub (Dec 7, 2025): You can fix this easily inside the launcher: Go to 7. Troubleshooting & Support Run 4. Fix unresolved conflicts or unmerged files [SillyTavern] You should now be able to launch SillyTavern normally with: 1. Update & Start SillyTavern

bsakaguchi commented

2026-10-15 18:06:42 +00:00

Author

Owner

@BrendanMcCauley commented on GitHub (Dec 7, 2025):

OK, that fixes the problem.

@BrendanMcCauley commented on GitHub (Dec 7, 2025): OK, that fixes the problem.

bsakaguchi referenced this issue

2026-10-15 18:07:05 +00:00

[PR #64] [MERGED] Put p #113