CalvinBackup/OpenAirframes
1
0
Fork 0
mirror of https://github.com/PlaneQuery/OpenAirframes.git synced 2026-07-25 11:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix update-community-prs.yaml

Browse Source
This commit is contained in:
ggman12
2026-02-13 11:52:53 -05:00
parent 6f6b65780a
commit 17098ae39a
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/update-community-prs.yaml
-1
View File
@@ -70,7 +70,6 @@ jobs:
echo " Merge conflict in PR #$pr_number, adding comment" echo " Merge conflict in PR #$pr_number, adding comment"
gh pr comment "$pr_number" --body $'⚠️ **Merge Conflict**\n\nAnother community submission was merged and this PR has conflicts.\n\nA maintainer may need to:\n1. Close this PR\n2. Remove the `approved` label from the original issue\n3. Re-add the `approved` label to regenerate the PR' gh pr comment "$pr_number" --body $'⚠️ **Merge Conflict**\n\nAnother community submission was merged and this PR has conflicts.\n\nA maintainer may need to:\n1. Close this PR\n2. Remove the `approved` label from the original issue\n3. Re-add the `approved` label to regenerate the PR'
git merge --abort git merge --abort
fi
fi fi
git checkout main git checkout main