From 34aba71d324836f4746249f4193b9ffad188d8c8 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sat, 22 Nov 2025 12:07:46 -0300 Subject: [PATCH] bugfix: deshabilito check en merge --abort al buscar conflictos --- src/git_flow/command/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}")