chore: bump version and update CHANGELOG.md [skip ci]

bugfix: change pr title on merges between environments

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,24 @@
+## v1.17.2 - 2026-05-22
+
+- **bugfix**:  change pr title on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (de124ba)
+
+---
+
+
+## v1.17.1 - 2026-05-20
+
+- **bugfix**:  dont push environment branches since they are already created on remote [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (04c9a4b)
+
+---
+
+
+## v1.17.0 - 2026-05-20
+
+- **feature**:  allow merges between environments [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (5806aea)
+
+---
+
+
 ## v1.16.1 - 2026-05-20
 
 - **bugfix**:  arreglo split de branch para armar correctamente el titulo del PR [[jteran](mailto:jteran@renatre.org.ar)] (a0d3028)

src/git_flow/command/base.py

@@ -18,7 +18,7 @@ TYPE_INFO = 3
 
 
 flowconfig = Git.get_config(FLOWCONFIG_FILENAME) if isfile(FLOWCONFIG_FILENAME) else {}
-
+environments = flowconfig["flow.branches"].split(",") if "flow.branches" in flowconfig else []
 
 def ensure_initialized():
     initialized = flowconfig["flow.initialized"] if flowconfig else None
@@ -46,7 +46,6 @@ def ensure_right_branch():
 
 def get_branch_env_and_type(branch: str) -> tuple[str, str]:
     components = branch.split("/")
-    target_branches = flowconfig["flow.branches"].split(",")
 
     if len(components) == 2:
         if components[0] not in BRANCH_TYPES:
@@ -54,13 +53,13 @@ def get_branch_env_and_type(branch: str) -> tuple[str, str]:
                 f"Branch inválida, el tipo '{components[0]}' no es válido."
             )
 
-        return (target_branches[0], components[0])
+        return (environments[0], components[0])
     elif len(components) == 4:
-        target_branches = target_branches[1:]
+        valid_environments = environments[1:]
 
         if (
             components[0] != "release"
-            or components[1] not in target_branches
+            or components[1] not in valid_environments
             or components[2] not in BRANCH_TYPES
         ):
             raise GitFlowError(

src/git_flow/command/branch.py

@@ -41,7 +41,6 @@ def branch(
     ensure_initialized()
 
     current_branch = Git.get_current_branch()
-    environments = flowconfig["flow.branches"].split(",")
 
     if current_branch in environments:
         current_environment = current_branch

src/git_flow/command/merge.py

@@ -13,7 +13,22 @@ def merge():
     ensure_initialized()
 
     branch = ensure_right_branch()
-    target, _ = get_branch_env_and_type(branch)
+
+    if branch in environments:
+        if branch == environments[-1]:
+            raise GitFlowError("No se puede hacer un merge del último entorno.")
+
+        panel(
+            "Merge de entornos",
+            """Está por hacer un merge de 2 entornos que puede implicar muchos cambios en el proyecto.""",
+        )
+
+        if not confirm("¿Desea continuar?"):
+            raise GitFlowError("Ejecución abortada")
+
+        target = environments[environments.index(branch) + 1]
+    else:
+        target, _ = get_branch_env_and_type(branch)
 
     if "flow.remote" in flowconfig:
         remote = flowconfig["flow.remote"]
@@ -34,9 +49,10 @@ def run_remote(remote: str, token: str, branch: str, target: str):
     show_commits_to_merge(target)
 
     if confirm(f"¿Crear PR de '{branch}' a '{target}'?"):
-        Git("push", remote, branch, set_upstream=True).exec(
+        if branch not in environments:
-            print="Subiendo rama al remoto para crear PR"
+            Git("push", remote, branch, set_upstream=True).exec(
-        )
+                print="Subiendo rama al remoto para crear PR"
+            )
 
         create_pull_request(token, branch, target)
 
@@ -104,6 +120,10 @@ def create_pull_request(token: str, branch: str, target: str):
         Git("pull").exec(print="Obteniendo cambios")
 
 def _get_pr_title_from_branch(branch: str) -> str:
+    if branch in environments:
+        target = environments[environments.index(branch) + 1]
+        return f"Sincronización de entorno {branch} a {target}"
+
     components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
     branch_type = components[-2]
     branch_desc = components[-1]
@@ -124,4 +144,4 @@ def _get_pr_title_from_branch(branch: str) -> str:
         branch_type + ":",
         branch_ticket,
         branch_desc.replace("-", " ")
-    ]))
+    ]))

src/git_flow/command/new.py

@@ -13,9 +13,8 @@ def new():
 
     ensure_initialized()
     branch = ensure_right_branch()
-    envs = flowconfig["flow.branches"].split(",")
 
-    if branch not in envs:
+    if branch not in environments:
         warning("La rama actual no corresponde a un entorno configurado.")
 
     info("Se creará una nueva rama de trabajo sobre la rama actual.")

src/git_flow/command/release.py

@@ -13,10 +13,9 @@ def release(group: Optional[str] = None):
     ensure_initialized()
 
     branch = ensure_right_branch()
-    envs = flowconfig["flow.branches"].split(",")
     env, _ = get_branch_env_and_type(branch)
 
-    if env == envs[-1]:
+    if env == environments[-1]:
         raise GitFlowError(
             "No se puede hacer release de una rama en el ultimo entorno."
         )
@@ -25,7 +24,7 @@ def release(group: Optional[str] = None):
 
     ensure_clean_worktree(has_remote)
 
-    next_env = envs[envs.index(env) + 1]
+    next_env = environments[environments.index(env) + 1]
     next_branch = (
         branch.replace(f"/{env}/", f"/{next_env}/")
         if branch.startswith("release/")

src/git_flow/command/tag.py

@@ -20,10 +20,9 @@ def tag(token: Optional[str] = None):
     """Crea un nuevo tag para el último merge."""
     ensure_initialized()
 
-    envs = flowconfig["flow.branches"].split(",")
     target = Git.get_current_branch()
 
-    if target not in envs:
+    if target not in environments:
         raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
 
     branch = Git(