ci: support VRT snapshots in conflict resolver and fix 403 errors - #9689
Merged
arii merged 2 commits intoMar 27, 2026
Merged
Conversation
- Updated `.github/conflict-resolver.yml` to include a strategy for Playwright snapshots (`**/*.spec.ts-snapshots/*.png`) using 'theirs'. - Updated `.github/workflows/conflict-resolver.yml` to use a more robust token fallback (`PAT_TOKEN || ARI_PAT || GITHUB_TOKEN`) for `actions/checkout` and `GH_TOKEN` to resolve 403 Permission Denied errors during git push operations. Co-authored-by: arii <342438+arii@users.noreply.github.com>
Contributor
👋 Welcome to HRM!Thanks for your contribution. This repository uses Gemini AI for automated triage, code review, and generation. 🤖 Gemini Manual Trigger Quick Reference
For more details and GitHub CLI examples, see the Manual Trigger Guide. |
arii
deleted the
support-vrt-snapshots-conflict-resolve-3969048629015505026
branch
March 27, 2026 15:35
Contributor
🤖 Gemini Review SkippedReview was skipped for the following reason: 🤖 Gemini Manual Trigger Guide |
arii
added
the
not reviewed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
.github/conflict-resolver.ymlto include a strategy for Playwright snapshots (**/*.spec.ts-snapshots/*.png) using 'theirs'..github/workflows/conflict-resolver.ymlto use a more robust token fallback (PAT_TOKEN || ARI_PAT || GITHUB_TOKEN) foractions/checkoutandGH_TOKENto resolve 403 Permission Denied errors during git push operations.Description
Please include a summary of the change and which issue is fixed.
Fixes # (issue)
Change Type
Related Issues
Closes #(issue_number)