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

feature: hacer pull en rama actual antes de crear nueva rama

Browse Source
This commit is contained in:
Jonathan Teran Carballo
2025-12-14 13:43:23 -03:00
parent 897e9aa53b
commit 24be50111d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/command/new.py
+4 -1
View File
@@ -13,7 +13,7 @@ class NewCommand(Command):
def run(self, args: Namespace = Namespace()): def run(self, args: Namespace = Namespace()):
self.ensure_initialized() self.ensure_initialized()
self.ensure_right_branch() branch = self.ensure_right_branch()
self.info("Se creará una nueva rama de trabajo sobre la rama actual.") self.info("Se creará una nueva rama de trabajo sobre la rama actual.")
self.info("Debe seleccionar el tipo de cambio a realizar.") self.info("Debe seleccionar el tipo de cambio a realizar.")
@@ -21,6 +21,9 @@ class NewCommand(Command):
branch_type = self.choice("Tipos de cambio", BRANCH_TYPES) branch_type = self.choice("Tipos de cambio", BRANCH_TYPES)
new_branch = self._get_unique_branch_name(branch_type) new_branch = self._get_unique_branch_name(branch_type)
if "flow.remote" in self.flowconfig and Git.get_tracking_branch(branch):
Git("pull").exec(print="Actualizando rama actual")
if self.confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"): if self.confirm(f"¿Crear rama '{new_branch}' sobre la rama actual?"):
Git("switch", new_branch, create=True).exec(print="Creando nueva rama") Git("switch", new_branch, create=True).exec(print="Creando nueva rama")