From 77e338dcc8111cfc80c310c719defc3e7ee03b0b Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 21 Dec 2025 22:31:16 -0300 Subject: [PATCH] feature: deshacer rebase cuando este falla en el pasaje de cambios --- src/git_flow/command/release.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/git_flow/command/release.py b/src/git_flow/command/release.py index 2988818..69edc28 100644 --- a/src/git_flow/command/release.py +++ b/src/git_flow/command/release.py @@ -89,6 +89,12 @@ class ReleaseCommand(Command): else: Git("switch", next_branch, create=True).exec(print="Creando rama release") - Git("rebase", base, next_branch, onto=group).exec( + status = Git("rebase", base, next_branch, onto=group).code( print="Moviendo cambios hacia el siguiente ambiente" ) + + if status: + Git("rebase", abort=True).exec( + print="Deshaciendo cambios por conflictos" + ) + raise GitFlowError("Error al realizar pasaje de cambios a rama objetivo")