Qilan2 commited on
Commit
8eeef22
·
verified ·
1 Parent(s): 8677827

Update server2.py

Browse files
Files changed (1) hide show
  1. server2.py +1 -1
server2.py CHANGED
@@ -627,7 +627,7 @@ def SillyTavern():
627
  # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
628
 
629
  print('更新文件')
630
- os.system('git pull')
631
 
632
  os.chdir(data_folder)
633
  os.system(f"ls {data_folder}")
 
627
  # os.system("pv /sillytavern.tar.gz | tar -xvpf - -C / --use-compress-program=pigz")
628
 
629
  print('更新文件')
630
+ os.system('git pull --rebase --autostash')
631
 
632
  os.chdir(data_folder)
633
  os.system(f"ls {data_folder}")