mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
i
This commit is contained in:
@@ -33,6 +33,7 @@ try:
|
||||
local_branch.set_target(remote_commit.id)
|
||||
repo.head.set_target(remote_commit.id)
|
||||
repo.checkout_tree(repo.get(remote_commit.id))
|
||||
repo.reset(local_branch.target, pygit2.GIT_RESET_HARD)
|
||||
print("Fast-forward merge")
|
||||
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
|
||||
print("Update failed - Did you modified any file?")
|
||||
|
||||
Reference in New Issue
Block a user