Skip to content

Commit 3b77ec7

Browse files
authored
Merge pull request #4 from BRIKEV/staging
ci: new workflow
2 parents 9b35671 + 0bac7d6 commit 3b77ec7

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

.github/workflows/sync-staging.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ jobs:
2121
2222
- name: Push to staging
2323
run: |
24-
git fetch origin staging
24+
git fetch origin
2525
git checkout staging
26-
git merge main --no-edit
27-
git push origin staging
26+
if git merge --ff-only origin/main; then
27+
echo "Fast-forward successful. Pushing..."
28+
git push origin staging
29+
else
30+
echo "No fast-forward possible. Skipping push."
31+
fi

0 commit comments

Comments
 (0)