.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