This commit is contained in:
lvmin
2023-08-11 09:37:18 -07:00
parent f8fc552562
commit e4c33940b1
+1
View File
@@ -31,6 +31,7 @@ try:
print("Already up-to-date") print("Already up-to-date")
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD: elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
local_branch.set_target(remote_commit.id) local_branch.set_target(remote_commit.id)
repo.head.set_target(remote_commit.id)
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?")