i

2023-08-11 09:48:59 -07:00 · 2023-08-11 09:48:59 -07:00 · e45fd3575c
parent 3d5c0b4235
commit e45fd3575c
1 changed files with 1 additions and 0 deletions
--- a/entry_with_update.py
+++ b/entry_with_update.py
@ -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?")