Skip to content

ci: update conflict predictor comment action #7316

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
PastaPastaPasta merged 3 commits into from
May 12, 2026
Merged

ci: update conflict predictor comment action #7316

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e78944
ci: update conflict predictor comment action
thepastaclaw May 9, 2026
3c5105c
ci: allow conflict predictor to update PR comments
thepastaclaw May 9, 2026
5d0c7d1
ci: tolerate conflict comment permission errors
thepastaclaw May 10, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/predict-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
continue-on-error: true
- name: Post conflict comment
if: steps.validate_conflicts.outputs.has_conflicts == 'true'
uses: mshick/add-pr-comment@v2
uses: mshick/add-pr-comment@v3
with:
message-id: conflict-prediction
message: |
Expand All @@ -48,7 +48,7 @@ jobs:
Please coordinate with the authors of these PRs to avoid merge conflicts.
- name: Remove conflict comment if no conflicts
if: steps.validate_conflicts.outputs.has_conflicts == 'false'
uses: mshick/add-pr-comment@v2
uses: mshick/add-pr-comment@v3
with:
message-id: conflict-prediction
message: |
Expand Down
Loading