From 67e7fe35f9b4b92af3cf9ea167434f934a947634 Mon Sep 17 00:00:00 2001
From: Manuel <mjmorales.mcv@gmail.com>
Date: Tue, 2 Sep 2025 00:22:34 +0200
Subject: [PATCH] workflow

---
 .gitea/workflows/merge-dev.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/merge-dev.yaml b/.gitea/workflows/merge-dev.yaml
index 98fa0dd..fdfcb9b 100644
--- a/.gitea/workflows/merge-dev.yaml
+++ b/.gitea/workflows/merge-dev.yaml
@@ -27,7 +27,7 @@ jobs:
           git pull origin dev
 
           # Intentar hacer merge de dev a la rama feature actual
-          git merge dev
+          git merge origin/dev
 
           if ($LASTEXITCODE -eq 0) {
               # Si el merge fue exitoso (sin conflictos), hacer push