-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 |