MCVIngenieros/mmorales.photo
3
1
Fork 0
Code Issues 15 Pull Requests 1 Actions 2 Projects 3 Releases Wiki Activity

--allow-unrelated-histories
Some checks failed
Auto-Merge Dev / auto-merge-dev (push) Failing after 1m8s
Details

Browse Source
This commit is contained in:
MANUEL JUAN MORALES AMAT
2025-09-02 00:52:01 +02:00
parent 1ded384fd7
commit 2360630544
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/merge-dev.yaml
View File

@@ -35,7 +35,7 @@ jobs:
git pull origin dev git pull origin dev
# Intentar hacer merge de dev a la rama feature actual # 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) { if ($LASTEXITCODE -eq 0) {
# Si el merge fue exitoso (sin conflictos), hacer push # Si el merge fue exitoso (sin conflictos), hacer push