From 726c73af39f2b855ffe20632b4cbb71897f83641 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 21 Dec 2025 23:30:46 -0300 Subject: [PATCH] feature: al agrupar release, mergear cambios en rama group --- src/git_flow/command/release.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/git_flow/command/release.py b/src/git_flow/command/release.py index 69edc28..9c43e40 100644 --- a/src/git_flow/command/release.py +++ b/src/git_flow/command/release.py @@ -55,9 +55,11 @@ class ReleaseCommand(Command): print("- " + commit) group = args.group + grouping = group is not None - if not group: + if not grouping: if self.confirm("¿Desea agrupar este release con otra rama?", False): + grouping = True group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/")) else: group = next_env @@ -98,3 +100,6 @@ class ReleaseCommand(Command): print="Deshaciendo cambios por conflictos" ) raise GitFlowError("Error al realizar pasaje de cambios a rama objetivo") + elif grouping: + Git("switch", group).exec(print="Cambiando a rama objetivo") + Git("merge", next_branch, ff_only=True).exec(print="Mergeando cambios de la nueva rama")