Skip to content

Commit cb4876a

Browse files
committed
Instruct agent to never skip commits when cherry-picking
1 parent 9da3463 commit cb4876a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

agents/backport_agent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ def get_instructions() -> str:
197197
d. Complete cherry-pick: `cherry_pick_continue` tool
198198
3. CRITICAL: Only move to next commit after current one is FULLY COMPLETE
199199
4. NEVER try to cherry-pick multiple commits at once
200-
5. If a commit truly cannot be adapted (very rare), skip it and note why
201-
6. Do NOT fall back to approach B - keep cherry-picking through all PR commits
200+
5. Do NOT fall back to approach B - keep cherry-picking through all PR commits
201+
6. NEVER skip any commits - all commits must be adapted and cherry-picked
202202
203203
3g. Generate the final patch file from upstream:
204204
- Use `generate_patch_from_commit` tool on <UPSTREAM_REPO>

0 commit comments

Comments
 (0)