We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
2 parents 9b35671 + 0bac7d6 commit 3b77ec7Copy full SHA for 3b77ec7
1 file changed
.github/workflows/sync-staging.yml
@@ -21,7 +21,11 @@ jobs:
21
22
- name: Push to staging
23
run: |
24
- git fetch origin staging
+ git fetch origin
25
git checkout staging
26
- git merge main --no-edit
27
- git push origin staging
+ if git merge --ff-only origin/main; then
+ 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