From 2360630544b4146e651ba911ff3794d1caca180b Mon Sep 17 00:00:00 2001
From: Manuel <mjmorales.mcv@gmail.com>
Date: Tue, 2 Sep 2025 00:52:01 +0200
Subject: [PATCH] --allow-unrelated-histories

---
 .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 2d3e4b3..fb91b00 100644
--- a/.gitea/workflows/merge-dev.yaml
+++ b/.gitea/workflows/merge-dev.yaml
@@ -35,7 +35,7 @@ jobs:
           git pull origin dev
 
           # Intentar hacer merge de dev a la rama feature actual
-          git merge origin/dev
+          git merge origin/dev --allow-unrelated-histories
 
           if ($LASTEXITCODE -eq 0) {
               # Si el merge fue exitoso (sin conflictos), hacer push