Update ff.py

ff.py

@@ -197,7 +197,11 @@ def create_space(type,key = "", value = ""):
         # os.system(f"wget -O '/data/{tmp_name}/Dockerfile' https://huggingface.co/datasets/Qilan2/ff/raw/main/Dockerfile")
         os.system('git add .')
         os.system('git commit -m "0"')
-        os.system('git push origin main')
+        push_result = os.system('git push origin main')
+            if push_result != 0:
+                print("推送失败，可能有冲突，尝试拉取并合并...")
+                os.system('git pull origin main --rebase')
+                os.system('git push origin main')
 def get_latest_local_package(directory, pattern='*.tar.gz'):
     try:
         # 构建完整的搜索路径
@@ -599,7 +603,7 @@ if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('
         print("检测到Firefox配置，启动定期重启循环...")
         response = create_space(2)
         print(response)
-        time.sleep(60)#21600 = 6小时
+        time.sleep(20)#21600 = 6小时
         github(2)
         response = create_space(1)
         print(response)