Skip to content

fix(git): restore continuous conflict review and guard resolution - #235

Merged
Ysheep666 merged 2 commits into
mainfrom
feat/20260930
Oct 1, 2026
Merged

Ysheep666 merged 2 commits into
mainfrom
feat/20260930

Conversation

@Ysheep666

@Ysheep666 Ysheep666 commented Oct 1, 2026 •

Copy link
Copy Markdown
Contributor

Change

  • Restore conflict review to the shared continuous multi-file CodeView: one header/collapse/scroll owner; sidebar clicks navigate instead of replacing the document.
  • Keep theme and mutation authority live; refresh review state before enabling the next write.
  • Reject stale stage OID/mode identities and replaced/tampered atomic-write candidates; retain foreign replacement entries on cleanup.
  • Bound exact numstat pathspec batches without loading conflict descendants; handle prefix/ancestor renames and literal path metacharacters.
  • Resolve gitlinks without reading commit objects in the superproject; stream marker detection so large binaries remain selectable and large text markers remain blocked.
  • Update conflict specification, four locales, regression coverage, and CHANGELOG Unreleased.

Verification

  • pnpm preflight:full: passed (static, signed release plugin-index assets, full unit/component/coverage, application build, Swift tests, native addon build).
  • Unit: 14,084 passed / 10 skipped; component: 643 passed.
  • Coverage run: 14,782 passed / 10 skipped; native: 103 passed.
  • Actual production Git smoke: mode-only stale rejection; both gitlink choices; 65MiB binary staging and 65MiB late-text-marker rejection; 5,000 long conflicts with ordinary rename accounting.
  • Actual macOS native fault injection: symlink replacement, regular-file replacement, and same-inode content tampering rejected without touching the target or deleting foreign candidates; normal executable-file publication succeeded.
  • Exact CLI pathspec smoke: Unicode, literal glob characters/backslash, filename prefixes, and ancestor rename with conflict descendant.

Limits

  • Linux-only atomic-write tests are among the macOS platform skips; PR Linux CI must exercise them.
  • The documented final stat/rename window is not a kernel compare-and-swap guarantee.

Release intent

User explicitly requested direct stable publication, skipping candidate observation. Merge this feature first; then release pending plugin bundles, then host stable version/tag via main and GitHub Actions.

Linux CI correction

  • Replaced the ineffective node:fs/promises module mock with fault injection on real FileHandle methods. Production publication code and all eight Linux assertions are unchanged.
  • macOS pnpm preflight:ci passed after this correction. Linux Git/review tests: 264 passed, 3 platform skips. Actual Linux publication smoke: six scenarios passed, including candidate replacement/tampering/removal and normal 0755 publication.
  • Local Docker full coverage has one unchanged graph-watch timeout; no timeout, assertion, coverage threshold, or check was relaxed. Merge remains gated on the full GitHub Quality Gate.

@Ysheep666
Ysheep666 merged commit 00a0054 into main Oct 1, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant