lllyasviel commited on
Commit
28192d5
·
1 Parent(s): 31833d7
Files changed (1) hide show
  1. entry_with_update.py +1 -0
entry_with_update.py CHANGED
@@ -32,6 +32,7 @@ try:
32
  elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
33
  local_branch.set_target(remote_commit.id)
34
  repo.head.set_target(remote_commit.id)
 
35
  print("Fast-forward merge")
36
  elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
37
  print("Update failed - Did you modified any file?")
 
32
  elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD:
33
  local_branch.set_target(remote_commit.id)
34
  repo.head.set_target(remote_commit.id)
35
+ repo.checkout_tree(repo.get(remote_commit.id))
36
  print("Fast-forward merge")
37
  elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
38
  print("Update failed - Did you modified any file?")