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

workflow

Browse Source
This commit is contained in:
MANUEL JUAN MORALES AMAT
2025-09-02 00:22:34 +02:00
parent a223dfc7c0
commit 67e7fe35f9
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

@@ -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