…flicts (#1046) ## Summary - Updated AI conflict resolution prompt with explicit rules for modify/delete conflicts - For modify/delete conflicts (file "deleted in HEAD"), the AI now keeps the file instead of deleting it - Removed `--allow-empty` fallback — empty cherry-picks now fall back to manual instructions since they indicate incorrect AI resolution ## Context Cherry-pick of PR RedHatQE/mtv-api-tests#349 to v2.10 resulted in an empty PR (#352) because the AI deleted the file (following the old prompt's "prefer target branch version" instruction). The file `tools/bm-dns-setup.sh` doesn't exist on v2.10 — git reports this as "deleted in HEAD" but it's actually a new file being brought to the target branch. ## Test plan - [x] Updated `test_cherry_pick_ai_resolves_conflicts` verifies prompt includes modify/delete guidance - [x] Updated `test_cherry_pick_ai_empty_result_falls_back_to_manual` verifies empty cherry-picks fail correctly - [x] Full test suite passes (1436 tests, 90.28% coverage) Closes #1043  ## Summary by CodeRabbit * **Improvements** * Updated AI conflict-resolution behavior to handle modify/delete conflicts more explicitly and simplify post-resolution instructions. * **Bug Fixes** * Changed empty cherry-pick handling to report failure instead of creating empty commits or attempting auto-fallbacks. * **Tests** * Updated tests to expect a manual fallback path and to verify the AI prompt includes delete/modify conflict guidance.

Set rate limit to 500 - 351 #352

Description

Activity

myakove-bot commented on Feb 7, 2024

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions