feat: add intelligent conflict resolution to rebase skill - #173

Open

andyhorn wants to merge 7 commits into

mainfrom

feat/rebase-skill-conflict-resolution

Commits on Sep 9, 2026

feat: add intelligent conflict resolution to rebase skill

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

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

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

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

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

andyhorn
and
claude
committed
e82c2e6
feat: ask via AskUserQuestion and merge conflicts by intent

andyhorn
and
claude
committed
b1b71b2