5d4377338e
Aligns local custom agents, skills, and modified shared agents with upstream's
flat ce-<name>.agent.md + ce-<skill>/ convention introduced in upstream v3.x.
Changes:
- Delete 9 upstream-renamed agents for locally-dropped agents (design/*, rails
reviewers, ankane-readme-writer, data-migration-expert, performance-oracle,
security-sentinel)
- Delete ce-dhh-rails-style skill (local dropped dhh-rails-style entirely)
- Move 5 custom agents to flat ce-<name>.agent.md paths:
* python-package-readme-writer, design-conformance-reviewer,
tiangolo-fastapi-reviewer, zip-agent-validator, lint
- Rename 12 custom skill directories with ce- prefix:
* john-voice, jira-ticket-writer, hugo-blog-publisher, weekly-shipped,
proof-push, ship-it, story-lens, sync-confluence, excalidraw-png-export,
python-package-writer, fastapi-style, upstream-merge
- Port local Python/FastAPI edits into upstream's flat ce-best-practices-
researcher.agent.md and ce-kieran-python-reviewer.agent.md
- Update frontmatter name: fields in all 17 renamed files to match new paths
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1.0 KiB
1.0 KiB
status, priority, issue_id, tags, dependencies
| status | priority | issue_id | tags | dependencies | |
|---|---|---|---|---|---|
| pending | p2 | XXX |
|
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)