Skip to content

Commit

Permalink
chore: update sync-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
c0rtexR committed Oct 18, 2024
1 parent 239240f commit 3982687
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/sync-dev-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ jobs:
- name: Sync development to main
run: |
git checkout main
git merge origin/development --no-ff -m "Merge development into main"
git push origin main
git merge origin/development --ff-only -m "Fast-forward main to latest development"
git push [email protected]:${GITHUB_REPOSITORY}.git main
- name: Handle merge conflicts
- name: Handle merge conflicts or non-fast-forward situations
if: failure()
run: |
echo "⚠️ There was a conflict during the merge. Please resolve it manually."
git merge --abort
echo "⚠️ Unable to fast-forward. There might be commits on main that are not in development."
echo "Please review the branches and merge manually if necessary."
exit 1

0 comments on commit 3982687

Please sign in to comment.