diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3830e56..3503387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Domingo,  2 de Noviembre de 2025, 15:32
+
+- Autor: [Jonathan Teran Carballo](mailto:jonathan.nerat@gmail.com)
+- Rama: `bugfix/set-locale-error`
+
+### Commits
+
+- **bugfix**:  agrego try except al setlocale para capturar errores en pipeline (f45d313)
+	- git-flow (M)
+
+---
+
 ## Domingo,  2 de Noviembre de 2025, 14:00
 
 - Autor: [Jonathan Teran Carballo](mailto:jonathan.nerat@gmail.com)
diff --git a/git-flow b/git-flow
index 3e49964..b34c31e 100755
--- a/git-flow
+++ b/git-flow
@@ -12,10 +12,14 @@ from lib.io import *
 
 
 REPOSITORY_TOKEN_PATH=".repository-token"
+LOCALE = 'es_AR.UTF-8'
 
 
 def main():
-    locale.setlocale(locale.LC_ALL, 'es_AR.UTF-8')
+    try:
+        locale.setlocale(locale.LC_ALL, LOCALE)
+    except locale.Error as e:
+        print_warning(f"No se pudo configurar el locale '{LOCALE}': {e}")
 
     args = sys.argv