We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 5b232fe commit a628605Copy full SHA for a628605
conflict_mediator/download.py
@@ -61,5 +61,5 @@ def setup(verbose: bool = False):
61
run_command(["git", "merge", "A", "--no-edit"], verbose)
62
try:
63
run_command(["git", "merge", "B", "--no-edit"], verbose)
64
- except Exception:
+ except BaseException:
65
print("Fix the merge conflict in script.py!")
0 commit comments