feat: add intelligent conflict resolution to rebase skill#173

Open

andyhorn wants to merge 6 commits into

mainfrom

feat/rebase-skill-conflict-resolution

Commits on Jun 11, 2026

feat: add intelligent conflict resolution to rebase skill

andyhorn
and
claude
committed
docs: keep rebase conflict guidance tech-agnostic

andyhorn
and
claude
committed
feat: allow safe read-only git commands in rebase skill

andyhorn
and
claude
committed
fix: enable and harden the rebase skill conflict-resolution path

andyhorn
and
claude
committed
fix: make rebase conflict-resolution heuristics safer

andyhorn
and
claude
committed
docs: tidy rebase skill clean-path guidance and rules

andyhorn
and
claude
committed