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

Merged in feature/allow-environment-merges (pull request #71 )
feature: allow merges between environments Approved-by: Jonathan Teran
2026-05-20 20:01:41 +00:00 · 2026-05-20 20:00:57 +00:00 · 2026-05-20 17:00:20 -03:00
2 changed files with 24 additions and 1 deletions
@@ -1,3 +1,10 @@
+## 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)
@@ -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"]
Author	SHA1	Message	Date
bitbucket-pipelines	184b135886	chore: bump version and update CHANGELOG.md [skip ci]	2026-05-20 20:01:41 +00:00
JonathanGitFlowandjt	acc0e8666a	Merged in feature/allow-environment-merges (pull request #71 ) feature: allow merges between environments Approved-by: Jonathan Teran	2026-05-20 20:00:57 +00:00
jt	5806aeab27	feature: allow merges between environments	2026-05-20 17:00:20 -03:00