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

workflow #38

Merged
manuel merged 8 commits from feature/docs into dev 2025-09-02 00:55:31 +02:00
Conversation 0 Commits 8 Files Changed 6 +1 -1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2360630544 - Show all commits

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