dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-06 20:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

catch all git errors

Browse source
This commit is contained in:
Paul Gauthier 2024-08-31 08:36:00 -07:00
parent 72c9ac460b
commit 5a6f7b3cd1
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aider/coders/search_replace.py
View file

@ -484,7 +484,7 @@ def git_cherry_pick_osr_onto_o(texts):
# cherry pick R onto original
try:
repo.git.cherry_pick(replace_hash, "--minimal")
except git.exc.ODBError:
except (git.exc.ODBError, git.exc.GitError):
# merge conflicts!
return
@ -522,7 +522,7 @@ def git_cherry_pick_sr_onto_so(texts):
# cherry pick replace onto original
try:
repo.git.cherry_pick(replace_hash, "--minimal")
except git.exc.ODBError:
except (git.exc.ODBError, git.exc.GitError):
# merge conflicts!
return