Work#21

Merged

jordfras merged 19 commits intomainfrom

Mar 21, 2026

Commits on Mar 21, 2026

tasks: Add T131-T133 fixup conflict bugs
jordfras
committed
fix: Skip commit message editor after fixup conflict resolution (T131)
jordfras
committed
fix: stage_file handles deleted files in conflict resolution (T132)
jordfras
committed
test: add regression test for clean workdir after squash/fixup abort (T131)
jordfras
committed
feat: Add -V to show version number and show version in --help
jordfras
committed
task: Add T134 external editor conflict resolution not detected during squash/fixup
jordfras
committed
fix: Auto-stage externally resolved conflicts during rebase continue (T134)
jordfras
committed
chore: Remove version flags from TASKS.md, TASKS-COMPLETED.md, and implement-task prompt
jordfras
committed
chore: Prefer TDD for bug tasks: failing test commit before fix
jordfras
committed
chore: Suggest refactoring tasks before proceeding when design is a poor fit
jordfras
committed
tasks: Add T135 open editor during conflict resolution
jordfras
committed
feat: Add 'e' key to open editor during conflict resolution (T135)
jordfras
committed
feat: Add cargo-deny with license check configuration (T112)
jordfras
committed
ci: add cargo-deny license check to GitHub Actions (T113)
jordfras
committed