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

feature: merge command improvements

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,18 @@
+## v1.10.0 - 2025-12-15
+
+- **feature**:  agrego opcion para cambiar a rama objetivo y obtener cambios [[jteran](mailto:jteran@renatre.org.ar)] (df8998a)
+- **feature**:  agrego opcion para personalizar nombre de PR [[jteran](mailto:jteran@renatre.org.ar)] (c87b141)
+
+---
+
+
+## v1.9.1 - 2025-12-15
+
+- **bugfix**:  uso rama actual cuando esta es un entorno [[jteran](mailto:jteran@renatre.org.ar)] (c54cb95)
+
+---
+
+
 ## v1.9.0 - 2025-12-15
 
 - **bugfix**:  uso env actual en vez de rama actual para listar ramas [[jteran](mailto:jteran@renatre.org.ar)] (5d33b29)

src/git_flow/command/branch.py

@@ -46,7 +46,11 @@ class BranchCommand(Command):
 
         self.current_branch = Git.get_current_branch()
         self.environments = self.flowconfig["flow.branches"].split(",")
-        (current_environment, _) = self.get_branch_env_and_type(self.current_branch)
+
+        if self.current_branch in self.environments:
+            current_environment = self.current_branch
+        else:
+            (current_environment, _) = self.get_branch_env_and_type(self.current_branch)
 
         if args.trash:
             self.show_branches(TRASH_BRANCH_PREFIX)

src/git_flow/command/merge.py

@@ -80,7 +80,8 @@ class MergeCommand(Command):
 
     def create_pull_request(self, token: str, branch: str, target: str):
         changelog = Changelog()
-        title = branch.replace("/", ": ").replace("-", " ")
+        title = self.prompt("[Opcional] Ingrese un titulo para el PR")
+        title = title or branch.replace("/", ": ").replace("-", " ")
 
         if title.startswith("release: "):
             title = title[title.index(' ', title.index(' ') + 1) + 1:]
@@ -93,3 +94,7 @@ class MergeCommand(Command):
         )
 
         self.success(message)
+
+        if self.confirm("¿Desea cambiar a la rama objetivo y bajar los cambios?"):
+            Git("switch", target).exec(print="Cambiando a rama objetivo")
+            Git("pull").exec(print="Obteniendo cambios")