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")