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

feature: al agrupar release, mergear cambios en rama group

Browse Source
This commit is contained in:
jt
2025-12-21 23:30:46 -03:00
parent 057b32a2f9
commit 726c73af39
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/command/release.py
+6 -1
View File
@@ -55,9 +55,11 @@ class ReleaseCommand(Command):
print("- " + commit) print("- " + commit)
group = args.group 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): if self.confirm("¿Desea agrupar este release con otra rama?", False):
grouping = True
group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/")) group = self.choice("Grupo release: ", Git.get_branches("release/" + next_env + "/"))
else: else:
group = next_env group = next_env
@@ -98,3 +100,6 @@ class ReleaseCommand(Command):
print="Deshaciendo cambios por conflictos" print="Deshaciendo cambios por conflictos"
) )
raise GitFlowError("Error al realizar pasaje de cambios a rama objetivo") 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")