refactor\(source-control\)!: remove resolve-conflicts in favour of the pull-request conflict mode - part 3 of 3 #13199

Activity

1. melodic-automation-lanes

   added the

   Task

   issue type on Nov 4, 2026
2. melodic-automation-lanes

   added a parent issue on Nov 4, 2026

   • refactor(source-control)!: remove resolve-conflicts in favour of the pull-request conflict mode #13138
3. melodic-automation-lanes

   marked this as blocked by 2 issues on Nov 4, 2026

   • refactor\(source-control\)!: remove resolve-conflicts in favour of the pull-request conflict mode - part 1 of 3 #13197
   • refactor\(source-control\)!: remove resolve-conflicts in favour of the pull-request conflict mode - part 2 of 3 #13198
4. github-actions

   added

   needs-triageNot yet classified. Floor until a type and one priority tier are set.Not yet classified. Floor until a type and one priority tier are set.

   on Nov 4, 2026
5. github-actions commented on Nov 4, 2026

   

   github-actionsBot

   on Nov 4, 2026 – with GitHub Actions

   Last edited by melodic-automation-lanes

   Contributor

   More actions

   Proposed work class: work-class: scoped
   Basis: automated intake triage; the lanes App applied this class.

   Size: Medium
   Complexity: Low
   Uncertainty: Known
   Flags: none
   Blocked by: #13197, #13198

   I understood this as part 3 of 3 of #13138, which removes source-control:resolve-conflicts. This part updates the remaining docs, the ship action and its eval, and the upstream note. It is done when the rg search finds no references and the pr-unblock tests pass in CI. The scope is clear. The part 1 and part 2 issues (#13197, #13198) are siblings, not duplicates. I listed them as blockers because the final grep check can only pass once the removal itself has landed.

   _{Automated triage, applied by the lanes App.}
6. github-actions

   added

   priority: mediumReal value, no hard deadline; normal backlog flow.Real value, no hard deadline; normal backlog flow.

   and removed

   needs-triageNot yet classified. Floor until a type and one priority tier are set.Not yet classified. Floor until a type and one priority tier are set.

   on Nov 4, 2026
7. melodic-automation-lanes

   added

   status: readyTriaged, unblocked, and fully specified; eligible to pick up.Triaged, unblocked, and fully specified; eligible to pick up.

   work-class: scopedA briefed fix or small feature; blast radius bounded by the brief, tests exist.A briefed fix or small feature; blast radius bounded by the brief, tests exist.

   on Nov 4, 2026
8. melodic-automation-lanes

   set

   Work status

   to

   ready

   on Nov 4, 2026
9. melodic-automation-lanes commented on Nov 4, 2026

   

   melodic-automation-lanesBot

   on Nov 4, 2026

   Last edited by melodic-automation-lanes

   ContributorAuthor

   More actions

   Not admitted to the issue lane: merged pull request #13256 names it with Refs: after its newest decision or refinement comment, so its work may already be done: close the issue if it is, or post a comment whose first line is **Decision recorded.** saying what is left, which sends it back through intake. Admission takes the issue once each of those is met, when intake triages it again (.github/actions/resolve-config/admission-rules.json).
10. melodic-automation-lanes

    added

    status: confirmedA maintainer confirmed the item is real and in scope; ready to be worked.A maintainer confirmed the item is real and in scope; ready to be worked.

    and removed

    status: readyTriaged, unblocked, and fully specified; eligible to pick up.Triaged, unblocked, and fully specified; eligible to pick up.

    on Nov 4, 2026
11. melodic-automation-lanes

    changed

    Work status

    to

    confirmed

    on Nov 4, 2026
12. kyle-sexton commented on Nov 4, 2026

    

    kyle-sexton

    on Nov 4, 2026

    Member

    More actions

    Delivered: closing as completed.
    Agent choice, not an owner answer.

    • Item 1 (the README, docs/skill-cheat-sheet.md, plugins/work-items/skills/ship/actions/run.md and its eval, and docs/upstream/mattpocock-skills.md updated to the removal): delivered by refactor(source-control)!: remove resolve-conflicts in favour of the pull-request conflict mode #13256 (merge commit 9b3f10f); its pr-verify note records this item delivered in full.
    • Item 2, run at that merge commit in a checkout of 9b3f10f:
      • rg -n 'source-control:resolve-conflicts' plugins docs .github --glob '!**/CHANGELOG.md' --glob '!.changes/**': no matches (exit 1).
      • node --test '.github/scripts/pr-unblock/*.test.mjs': tests 1326, pass 1326, fail 0.

    The PR's own CI never selected the pr-unblock suites (#13256 touches no pr-unblock file), so item 2 is settled by this run at the merge commit; #13266 tracks that gap in pr-verify.
13. kyle-sexton commented on Nov 4, 2026

    

    kyle-sexton

    on Nov 4, 2026

    Member

    More actions

    Closing on the delivery record above (issuecomment-6634167843): both items met at merge commit 9b3f10f.
14. kyle-sexton

    closed this as completedon Nov 4, 2026