Skip to content

Commit b6995f7

Browse files
committed
fix skill bug
1 parent 767e4fb commit b6995f7

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -142,23 +142,19 @@ Read the merge result from the report's `Merge Prep` section.
142142
1. Abort the merge: `git merge --abort` if a merge is still in progress
143143
2. Post a comment on the PR explaining the situation:
144144
```bash
145-
gh pr comment <PR_NUMBER> --body "This PR has significant merge conflicts with main ($(N) conflicting files). Moving back to Ready for rework.
145+
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.
146146
147147
Conflicting files:
148148
$(list of files)
149149
150150
The PR needs to be rebased on current main and conflicts resolved before it can proceed through the review pipeline."
151151
```
152-
3. Close the PR:
153-
```bash
154-
gh pr close <PR_NUMBER>
155-
```
156-
4. Move the project item back to `Ready`:
152+
3. Move the project item back to `Ready`:
157153
```bash
158154
python3 scripts/pipeline_board.py move <ITEM_ID> ready
159155
```
160-
5. Report: `PR #N has too many merge conflicts — closed and moved back to Ready for rework.`
161-
6. STOP processing this PR.
156+
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.`
157+
5. STOP processing this PR.
162158

163159
### 2. Fix Copilot Review Comments
164160

@@ -350,7 +346,7 @@ Completed: 2/2 | All moved to Final review
350346
| Worktree left behind on failure | Always clean up with `git worktree remove` in Step 5 |
351347
| Working in main checkout | All work happens in `.worktrees/` — never modify the main checkout |
352348
| Skipping merge with main | Always merge origin/main in Step 1a to catch conflicts before fixing comments |
353-
| Wasting time on heavy conflicts | If >3 files conflict or core impl files are affected, close PR, move to Ready, and let project-pipeline rework it |
349+
| 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 |
354350
| Ignoring issue comments | Always check the linked issue (`Fix #N`) for human feedback in Step 2a |
355351
| Only checking Copilot comments | Step 2a checks human PR reviews and linked issue comments too — bot-only review is insufficient |
356352
| 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 |

0 commit comments

Comments
 (0)