Files

John Lamb eb96e32c58 Merge upstream v2.40.0 with local fork additions preserved

Incorporates 163 upstream commits (origin/main) while preserving all
local skills, agents, and commands. Metadata descriptions updated to
reflect actual component counts (30 agents, 56 skills, 7 commands).
file-todos/SKILL.md merged with both upstream command rename and local
assessment fields.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

2026-03-16 10:45:33 -05:00

1.0 KiB

Raw Blame History

status, priority, issue_id, tags, dependencies

status

priority

issue_id

Merge Conflict: [filename]

File Info

Field	Value
File	`path/to/file`
Category	agent / command / skill / config / other
Conflict Type	content / modify-delete / add-add

What Changed

Remote Version

[What the upstream version added, changed, or intended]

Local Version

[What the local version added, changed, or intended]

Diff

Show diff

[Relevant diff content]

Recommendation

Suggested resolution: Accept remote / Keep local / Merge both / Keep deleted

[Reasoning for the recommendation, considering the local fork's guiding principles]

Decision

Resolution: (filled during triage)

Details: (specific merge instructions if "merge both")

Acceptance Criteria

Resolution applied correctly
No content lost unintentionally
Local intent preserved
File validates (JSON/YAML if applicable)

1.0 KiB Raw Blame History