SillyTavern/SillyTavern-Launcher
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern-Launcher.git synced 2026-05-05 05:31:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

code organize & cleanup

Browse Source
This commit is contained in:
deffcolony
2024-07-07 16:27:53 +02:00
parent f4f1561361
commit e92a0d668b
14 changed files with 1889 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/functions/Toolbox/Troubleshooting/fix_github_conflicts.bat Normal file
View File

@@ -0,0 +1,17 @@
@echo off
:fix_github_conflicts
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Trying to resolve unresolved conflicts in the working directory or unmerged files...
cd /d "%st_install_path%"
git merge --abort
git reset --hard
git pull --rebase --autostash
echo %blue_bg%[%time%]%reset% %blue_fg_strong%[INFO]%reset% Done.
pause
if "%caller%"=="home" (
exit /b 1
) else (
exit /b 0
)