fix skill

Author: GiggleLiu

.claude/skills/review-pipeline/SKILL.md

@@ -136,25 +136,9 @@ Read the merge result from the report's `Merge Prep` section.
 - If there are conflicts:
   1. Inspect the conflicting files listed in the report.
   2. Compare the current skill versions on main vs the PR branch to understand which patterns are current.
-  3. Resolve conflicts (prefer main's patterns for skill-generated code, the PR branch for problem-specific logic, main for regenerated artifacts like JSON).
+  3. Resolve **all** conflicts regardless of how many files are affected (prefer main's patterns for skill-generated code, the PR branch for problem-specific logic, main for regenerated artifacts like JSON).
   4. Stage resolved files, commit, and push.
-- If the report says the merge status is `conflicted` and there are too many conflicts (>3 files, or conflicts in core implementation files beyond just JSON/skill artifacts):
-  1. Abort the merge: `git merge --abort` if a merge is still in progress
-  2. Post a comment on the PR explaining the situation:
-     ```bash
-     gh pr comment <PR_NUMBER> --body "This PR has significant merge conflicts with main ($(N) conflicting files). Moving the linked board item back to Ready for rework while leaving the PR open.
-
-     Conflicting files:
-     $(list of files)
-
-     The PR needs to be rebased on current main and conflicts resolved before it can proceed through the review pipeline."
-     ```
-  3. Move the project item back to `Ready`:
-     ```bash
-     python3 scripts/pipeline_board.py move <ITEM_ID> ready
-     ```
-  4. Report: `PR #N has too many merge conflicts — left open and moved back to Ready for rework so project-pipeline can resume it later.`
-  5. STOP processing this PR.
+  5. Continue to the next step — the goal is to push PRs through to merge, not to bounce them back.
 
 ### 2. Fix Copilot Review Comments
 
@@ -346,7 +330,7 @@ Completed: 2/2 | All moved to Final review
 | Worktree left behind on failure | Always clean up with `git worktree remove` in Step 5 |
 | Working in main checkout | All work happens in `.worktrees/` — never modify the main checkout |
 | Skipping merge with main | Always merge origin/main in Step 1a to catch conflicts before fixing comments |
-| Wasting time on heavy conflicts | If >3 files conflict or core impl files are affected, leave the PR open, move the board item back to Ready, and let project-pipeline resume it |
+| Giving up on conflicts too easily | Always try to resolve all conflicts. Only move back to Ready if resolution would be genuinely dangerous (e.g. irreconcilable semantic conflicts that risk breaking correctness) |
 | Ignoring issue comments | Always check the linked issue (`Fix #N`) for human feedback in Step 2a |
 | Only checking Copilot comments | Step 2a checks human PR reviews and linked issue comments too — bot-only review is insufficient |
 | Saying "passed" while deferring issues | If anything remains for maintainer judgment, list it explicitly under `Remaining issues for final review` and mark the agentic result accordingly |