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

feature: allow merges between environments

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 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)
+
+---
+
+
 ## v1.16.0 - 2026-05-20
 
 - **feature**:  agrego soporte para especificar tickets en nombre e rama [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (f389118)

src/git_flow/command/merge.py

@@ -13,7 +13,23 @@ def merge():
     ensure_initialized()
 
     branch = ensure_right_branch()
-    target, _ = get_branch_env_and_type(branch)
+    environments = flowconfig["flow.branches"].split(",")
+
+    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"]
@@ -104,7 +120,7 @@ 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:
-    components = branch.split("-") # <type>/<desc> or release/<env>/<type>/<desc>
+    components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
     branch_type = components[-2]
     branch_desc = components[-1]