diff --git a/src/git_flow/command/merge.py b/src/git_flow/command/merge.py index 716e097..b3faafb 100644 --- a/src/git_flow/command/merge.py +++ b/src/git_flow/command/merge.py @@ -85,7 +85,7 @@ class MergeCommand(Command): print="Realizando merge de prueba para verificar conflictos" ) - Git("merge", abort=True).exec(print="Abortando merge de prueba") + Git("merge", abort=True).exec(print="Abortando merge de prueba", check=False) if merge_conflicts: self.error(f"La rama actual tiene conflictos con {target}")