Skip to content

ci(sync-patches): guard conflict-resolution path against empty commits #3124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caio-pizzol merged 1 commit into from
May 4, 2026
+7 −0
Merged

ci(sync-patches): guard conflict-resolution path against empty commits #3124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/sync-patches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ jobs:

# Check if all conflicts are resolved
if [ -z "$(git diff --name-only --diff-filter=U)" ]; then
# If every conflict was auto-resolved to main's version, the index
# may now be clean (nothing to sync). Same guard as the no-conflict path.
if git diff --cached --quiet; then
echo "No changes to sync - auto-resolution kept main's version for everything."
exit 0
fi

git commit -m "chore: merge stable into main (release conflicts auto-resolved)"
git push origin "$SYNC_BRANCH"

Expand Down
Loading