Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

i

Browse Source
This commit is contained in:
lvmin
2023-08-11 09:48:59 -07:00
parent 3d5c0b4235
commit e45fd3575c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
entry_with_update.py
+1
View File
@@ -33,6 +33,7 @@ try:
local_branch.set_target(remote_commit.id) local_branch.set_target(remote_commit.id)
repo.head.set_target(remote_commit.id) repo.head.set_target(remote_commit.id)
repo.checkout_tree(repo.get(remote_commit.id)) repo.checkout_tree(repo.get(remote_commit.id))
repo.reset(local_branch.target, pygit2.GIT_RESET_HARD)
print("Fast-forward merge") print("Fast-forward merge")
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL: elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
print("Update failed - Did you modified any file?") print("Update failed - Did you modified any file?")