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

Activity

1. 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
2. melodic-automation-lanes

   added the

   Task

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

   marked this as blocking on Nov 4, 2026

   • refactor\(source-control\)!: remove resolve-conflicts in favour of the pull-request conflict mode - part 3 of 3 #13199
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: Small
   Complexity: Low
   Uncertainty: Known
   Flags: none
   Blocked by: #13197

   Understood: this is part 2 of 3 of #13138. It repoints the resolve-conflicts activity's skill: and args: (with --unattended) in the pipeline config and example to the new pull-request conflict mode. It also updates three test files to assert the new skill and allowed-tools grant. The activity keeps its name.

   It depends on part 1 (#13197), which should provide the skill and mode this part names. Part 3 is #13199. These are sibling split children, not duplicates.

   _{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

   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

   needs-triage

   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

   The latest triage verdict holds nothing: the issue is at status: ready.
10. melodic-automation-lanes

    added

    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

    marked this as blocked on Nov 4, 2026

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

    changed

    Work status

    to

    ready

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

    

    melodic-automation-lanesBot

    on Nov 4, 2026

    ContributorAuthor

    More actions

    Not admitted to the issue lane yet: blocker #13197 is not closed by a listed human or a merge.
14. kyle-sexton

    unmarked this as blocked on Nov 4, 2026

    • refactor\(source-control\)!: remove resolve-conflicts in favour of the pull-request conflict mode - part 1 of 3 #13197
15. kyle-sexton

    marked this as blocking on Nov 4, 2026

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

    added

    agent-readyFully specified and briefed; eligible for autonomous pickup from the frontier.Fully specified and briefed; eligible for autonomous pickup from the frontier.

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

    changed

    Work status

    to

    agent-ready

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

    

    github-actionsBot

    on Nov 4, 2026 – with GitHub Actions

    Last edited by github-actions

    Contributor

    More actions

    No description provided.
19. github-actions commented on Nov 4, 2026

    

    github-actionsBot

    on Nov 4, 2026 – with GitHub Actions

    Last edited by github-actions

    Contributor

    More actions

    No description provided.
20. melodic-automation-lanes

    closed this as completedin #13212on Nov 4, 2026
21. melodic-automation-lanes

    removed

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

    agent-readyFully specified and briefed; eligible for autonomous pickup from the frontier.Fully specified and briefed; eligible for autonomous pickup from the frontier.

    on Nov 4, 2026