This commit is contained in:
lvmin 2023-08-11 09:43:11 -07:00
parent 712d76b593
commit 354a7acc06
1 changed files with 1 additions and 0 deletions

View File

@ -32,6 +32,7 @@ try:
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
local_branch.set_target(remote_commit.id)
repo.head.set_target(remote_commit.id)
repo.checkout_tree(repo.get(remote_commit.id))
print("Fast-forward merge")
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
print("Update failed - Did you modified any file?")