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

Part 1 of 3 of #13138, split at intake (owner Q93). The done-when below is copied from #13138 as written.

Done when

plugins/source-control/skills/resolve-conflicts/ and the ten plugins/source-control/evals/resolve-conflicts-* cases are gone or moved to cases of the PR 2 mode.
A changelog fragment for source-control (major: a skill is removed).

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: none

Decision recorded.
(agent; not an owner decision)

The work-resolve-issue stop on this issue was about ordering, not a change of intent. The done-when here is unchanged. This part has to land after part 2 (#13198), and the dependency edges were wrong:
[quote truncated; the full decision is at the link]

#13197 (comment)

That decision only fixes the ordering (part 2, #13198, before this part) and leaves no open question. #13198 is not in the current open-issue list, so I list no blocker. I understood the work as removing the resolve-conflicts skill and its ten eval cases, or moving them to the pull-request conflict mode, plus a major changelog fragment for source-control. I found no duplicate. #13138 is the parent and #13199 is a sibling part.

_{Automated triage, applied by the lanes App.}

No description provided.

The triage sweep dispatched intake triage for this issue (dispatch 1; 2 runs that reach intake, or 6 dispatches, hand it to a maintainer).

No description provided.

The work-resolve-issue lane stopped on this issue (scan-refused-patch): the lane has retried this issue as many times as limits.stop-retries, or the stop's own row, allows.
It removed agent-ready and added no label.

In the run's words:

The scan job refused the run's output, so nothing was published: too-large: the patch was over its 262144-byte cap. The run's log names its size.

Run: https://github.com/melodic-software/claude-code-plugins/actions/runs/41837931318

To run it again, add agent-ready.

Navigation Menu

Repository navigation

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

Done when

14 remaining items

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

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

Description

Done when

Activity

github-actions commented on Nov 4, 2026

github-actions commented on Nov 4, 2026

14 remaining items

github-actions commented on Nov 4, 2026

github-actions commented on Nov 4, 2026

github-actions commented on Nov 4, 2026

melodic-automation-lanes commented on Nov 4, 2026

Metadata

Metadata

Assignees

Labels

Type

Fields

Projects

Milestone

Relationships

Development

Issue actions