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

Update server.py

Browse files
Files changed (1) hide show
  1. server.py +1 -1
server.py CHANGED
@@ -637,7 +637,7 @@ def SillyTavern():
637
  print("Output:", e.output)
638
  os.system(f"ls {data_folder}")
639
  print('更新文件')
640
- os.system('git pull')
641
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
642
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
643
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
 
637
  print("Output:", e.output)
638
  os.system(f"ls {data_folder}")
639
  print('更新文件')
640
+ os.system('git pull --rebase --autostash')
641
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
642
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
643
  subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)