This commit is contained in:
parent
712d76b593
commit
354a7acc06
|
|
@ -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?")
|
||||
|
|
|
|||
Loading…
Reference in New Issue