Task #1 + Task #2 combined: - _abort_rebase_verified: escalation ladder abort → quit → reset --hard ORIG_HEAD - pre_cycle_recover: detect orphan rebase/merge state at cycle start - Integrate into pre_cycle_sync: refuse to proceed if recovery fails - Consolidate push.py:_pull_rebase to delegate to operations.py:git_pull_rebase - conflict_resolution module with LOCKFILE_STRATEGIES (bun/npm/pnpm/yarn/cargo/uv/poetry) - try_auto_resolve_lockfiles: conservative — acts only when all conflicts are lockfiles - git_pull_rebase: attempt auto-resolution before falling back to abort |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| conflict_resolution.py | ||
| diff_parser.py | ||
| discovery.py | ||
| operations.py | ||
| repository.py | ||
| submodules.py | ||