git pull origin main
From
https://github.com/devnen/chatterbox-tts-server
branch main -> FETCH_HEAD
Updating bdedb35..5bf7293
error: Your local changes to the following files would be overwritten by merge:
config.yaml
Please commit your changes or stash them before you merge.
Aborting
There is no option for me to confirm the merge, and the abortion is automatic.
This is a safety feature in Git. It's stopping because you've made changes to your config.yaml file, and it doesn't want to accidentally delete them.
Here is the easiest and safest way to fix it. Just run these three commands in order:
Save your changes:
git stash
Update the code:
git pull origin main
Get your changes back:
git stash pop
Your files will be updated, and your settings in config.yaml will be safe.