Files

John Lamb 0b26ab8fe6 Merge upstream origin/main with local fork additions preserved

Accept upstream's ce-review pipeline rewrite (6-stage persona-based
architecture with structured JSON, confidence gating, three execution
modes). Retire 4 overlapping review agents (security-sentinel,
performance-oracle, data-migration-expert, data-integrity-guardian)
replaced by upstream equivalents. Add 5 local review agents as
conditional personas in the persona catalog (kieran-python, tiangolo-
fastapi, kieran-typescript, julik-frontend-races, architecture-
strategist).

Accept upstream skill renames (file-todos→todo-create, resolve_todo_
parallel→todo-resolve), port local Assessment and worktree constraint
additions to new files. Merge best-practices-researcher with upstream
platform-agnostic discovery + local FastAPI mappings. Remove Rails/Ruby
skills (dhh-rails-style, andrew-kane-gem-writer, dspy-ruby) per fork's
FastAPI pivot.

Component counts: 36 agents, 48 skills, 7 commands.

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

2026-03-25 13:28:22 -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