Update ff.py
Browse files
ff.py
CHANGED
|
@@ -198,10 +198,10 @@ def create_space(type,key = "", value = ""):
|
|
| 198 |
os.system('git add .')
|
| 199 |
os.system('git commit -m "0"')
|
| 200 |
push_result = os.system('git push origin main')
|
| 201 |
-
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
| 205 |
def get_latest_local_package(directory, pattern='*.tar.gz'):
|
| 206 |
try:
|
| 207 |
# 构建完整的搜索路径
|
|
|
|
| 198 |
os.system('git add .')
|
| 199 |
os.system('git commit -m "0"')
|
| 200 |
push_result = os.system('git push origin main')
|
| 201 |
+
if push_result != 0:
|
| 202 |
+
print("推送失败,可能有冲突,尝试拉取并合并...")
|
| 203 |
+
os.system('git pull origin main --rebase')
|
| 204 |
+
os.system('git push origin main')
|
| 205 |
def get_latest_local_package(directory, pattern='*.tar.gz'):
|
| 206 |
try:
|
| 207 |
# 构建完整的搜索路径
|