From c6efbc977bb669e4826c16ba0e5efb13604fd323 Mon Sep 17 00:00:00 2001
From: Egutierrez <egutierrez@dead.dd>
Date: Fri, 8 May 2026 00:07:56 +0200
Subject: [PATCH] feat(infra): auto-commit con 1 cambios

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 bash/functions/infra/git_auto_commit_dirty.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bash/functions/infra/git_auto_commit_dirty.sh b/bash/functions/infra/git_auto_commit_dirty.sh
index 3f797962..2638e876 100644
--- a/bash/functions/infra/git_auto_commit_dirty.sh
+++ b/bash/functions/infra/git_auto_commit_dirty.sh
@@ -34,6 +34,13 @@ git_auto_commit_dirty() {
         return 0
     fi
 
+    # Saltear si hay merge conflicts sin resolver (UU, AA, DD, AU, UA, DU, UD).
+    # git add -A los aceptaria como resueltos y commitearia los markers — no.
+    if echo "$status" | grep -qE '^(UU|AA|DD|AU|UA|DU|UD) '; then
+        echo "git_auto_commit_dirty: '$abs_repo' tiene conflictos sin resolver — skipped" >&2
+        return 0
+    fi
+
     # Generar mensaje automatico si no se proporciono
     if [[ -z "$message" ]]; then
         message="$(_git_auto_commit_dirty_generate_message "$abs_repo" "$status")"