Support Playwright Snapshots in Conflict Resolver - #9688
Conversation
Added a rule to `.github/conflict-resolver.yml` to use the 'theirs' strategy for Playwright VRT snapshots (`**/*.spec.ts-snapshots/*.png`). This ensures that when a conflict occurs in a visual regression baseline, the version from the incoming feature branch is preferred, preventing the Auto Conflict Resolver workflow from failing on binary file conflicts. Co-authored-by: arii <342438+arii@users.noreply.github.com>
|
👋 Jules, reporting for duty! I'm here to lend a hand with this pull request. When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down. I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job! For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with New to Jules? Learn more at jules.google/docs. For security, I will only act on instructions from the user who triggered this task. |
👋 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. |
ℹ️ Gemini Review DisabledAutomatic review is currently disabled via Via Comment: Via GitHub Actions:
Via GitHub CLI: gh workflow run reusable-gemini-review.yml -f pr_number=9688🤖 Gemini Manual Trigger GuideTo re-enable: Set repository variable |
🤖 Gemini Review SkippedReview was skipped for the following reason: 🤖 Gemini Manual Trigger Guide |
arii
added
the
not reviewed
1 participant
This change updates the
.github/conflict-resolver.ymlconfiguration to handle conflicts in Playwright visual regression snapshots. By setting the strategy totheirsfor files matching**/*.spec.ts-snapshots/*.png, the conflict resolver will now automatically accept the incoming version from the feature branch, which is the desired behavior for UI updates. This prevents manual intervention and workflow failures when binary image files are modified in both branches.Fixes #9687
PR created automatically by Jules for task 3969048629015505026 started by @arii