jt/git-flow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: deshabilito check en merge --abort al buscar conflictos

Browse Source
This commit is contained in:
jt
2025-11-22 12:07:46 -03:00
parent 4135a789e3
commit 34aba71d32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/command/merge.py
+1 -1
View File
@@ -85,7 +85,7 @@ class MergeCommand(Command):
print="Realizando merge de prueba para verificar conflictos" 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: if merge_conflicts:
self.error(f"La rama actual tiene conflictos con {target}") self.error(f"La rama actual tiene conflictos con {target}")