ingitdb / ingitdb-cli / 26628367264

98%

push

github

feat(cli): implement resolve command and route rebase through it

Add a shared working-tree conflict engine (conflict_resolver.go):
gitConflictedFiles, parseResolveItems, and resolveGeneratedConflicts,
which regenerates conflicted generated files (collection README.md)
from source records and stages them, independent of which git
operation produced the conflict.

Implement `ingitdb resolve` (previously a stub) on top of the engine:
it auto-resolves README conflict markers left by any git operation
(manual rebase, merge, cherry-pick) and stages them. Supports --path
and --file.

Refactor `rebase` to delegate to the shared engine instead of
duplicating conflict detection. This also makes rebase spec-compliant
per cli/rebase#req:resolve-flag: READMEs are auto-resolved only when
--resolve=readme is passed; otherwise unresolved conflicts are
reported. runDocsUpdate routes through the same engine.

Maintains 100% statement coverage of cmd/ingitdb/commands. Removes two
redundant rebase tests superseded by the spec-compliant --resolve=readme
coverage tests.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

122 of 122 new or added lines in 5 files covered. (100.0%)

11159 of 11679 relevant lines covered (95.55%)

1.13 hits per line