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

---
 .gitea/workflows/merge-dev.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/merge-dev.yaml b/.gitea/workflows/merge-dev.yaml
index 98f5d4f..8a3c0e0 100644
--- a/.gitea/workflows/merge-dev.yaml
+++ b/.gitea/workflows/merge-dev.yaml
@@ -23,8 +23,12 @@ jobs:
 
       - name: Merge changes from dev
         run: |
-          git switch dev
-          git pull origin dev
-          git switch -
-          git merge dev
-          git push origin
+          git fetch origin
+          git checkout $GITHUB_REF  # la rama feature/*
+          git merge origin/dev
+          if [ $? -eq 0 ]; then
+            git push origin $GITHUB_REF
+          else
+            echo "Merge conflict detected, please resolve."
+            exit 1
+          fi