Skip to content

Auto-merge: feat/improve-sync-and-release #4

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
peter5842 merged 1 commit into from
Mar 21, 2026
Merged

Auto-merge: feat/improve-sync-and-release #4

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
6 changes: 3 additions & 3 deletions .github/workflows/auto-merge-feature-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
id: conflict_check
run: |
git fetch origin main
if ! git merge-tree $(git merge-base HEAD origin/main) HEAD origin/main | grep -q "^changed in both"; then
echo "has_conflict=false" >> $GITHUB_OUTPUT
else
if git merge-tree $(git merge-base HEAD origin/main) HEAD origin/main | grep -q "^changed in both"; then
echo "has_conflict=true" >> $GITHUB_OUTPUT
else
echo "has_conflict=false" >> $GITHUB_OUTPUT
fi

- name: Create conflict issue
Expand Down
Loading