You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: .claude/skills/review-pipeline/SKILL.md
+5-9Lines changed: 5 additions & 9 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -142,23 +142,19 @@ Read the merge result from the report's `Merge Prep` section.
142
142
1. Abort the merge: `git merge --abort` if a merge is still in progress
143
143
2. Post a comment on the PR explaining the situation:
144
144
```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.
146
146
147
147
Conflicting files:
148
148
$(list of files)
149
149
150
150
The PR needs to be rebased on current main and conflicts resolved before it can proceed through the review pipeline."
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.
162
158
163
159
### 2. Fix Copilot Review Comments
164
160
@@ -350,7 +346,7 @@ Completed: 2/2 | All moved to Final review
350
346
| Worktree left behind on failure | Always clean up with `git worktree remove`in Step 5 |
351
347
| Working in main checkout | All work happens in`.worktrees/` — never modify the main checkout |
352
348
| 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 |
| Only checking Copilot comments | Step 2a checks human PR reviews and linked issue comments too — bot-only review is insufficient |
356
352
| 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