feat: core/drift.ts + core/differ.ts — three-way merge engine (#11)#48

Merged

breferrari merged 20 commits intomainfrom

feat/11-merge-engine

Apr 19, 2026

Commits on Apr 19, 2026

feat(renderer): export renderString helper (#11)

breferrari
and
claude
committed
feat: core/drift.ts + core/differ.ts — three-way merge engine (#11)

breferrari
and
claude
committed
docs(roadmap): tick merge engine; defer orphan detection to v0.2 (#11, #47)

breferrari
and
claude
committed
refactor: dedupe ENOENT dance, parallelize drift reads, share state factory

breferrari
and
claude
committed
fix(differ): normalize CRLF in three-way merge inputs

breferrari
and
claude
committed
ci: run matrix on ubuntu + windows + macos

breferrari
and
claude
committed
chore(gitignore): exclude Claude Code's ScheduleWakeup lock file

breferrari
and
claude
committed
refactor: tighten merge engine per self-review

breferrari
and
claude
committed
refactor(errors): type-safe ErrorCode union for ShardMindError

breferrari
and
claude
committed
feat(drift): land orphan detection in v0.1 (closes #47)

breferrari
and
claude
committed
refactor: review-pass cleanup (vault-paths consts, LINE_SPLIT, inline helper)

breferrari
and
claude
committed
refactor: collapse review-pass dismissals after pushback

breferrari
and
claude
committed
test(merge): edge-case fixtures — empty file, UTF-8, frontmatter merge

breferrari
and
claude
committed
docs(spec): §4.8 and §4.9 reflect implementation reality

breferrari
and
claude
committed
feat: property-based invariants + fix node-diff3 prototype-key crash

breferrari
and
claude
committed
hardening: turn the merge engine upside down, fix 3 real bugs

breferrari
and
claude
committed
chore(gitignore): exclude local fork clones (e.g. node-diff3)

breferrari
and
claude
committed
Revert "chore(gitignore): exclude local fork clones (e.g. node-diff3)"

breferrari
and
claude
committed
docs: track the node-diff3 workaround removal as a followup (#49)

breferrari
and
claude
committed
fix: Copilot review round 2 — nine real findings

breferrari
and
claude
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: core/drift.ts + core/differ.ts — three-way merge engine (#11)#48

feat: core/drift.ts + core/differ.ts — three-way merge engine (#11)#48
breferrari merged 20 commits intomainfrom
feat/11-merge-engine

Commits on Apr 19, 2026

feat(renderer): export renderString helper (#11)

feat: core/drift.ts + core/differ.ts — three-way merge engine (#11)

docs(roadmap): tick merge engine; defer orphan detection to v0.2 (#11, #47)

refactor: dedupe ENOENT dance, parallelize drift reads, share state factory

fix(differ): normalize CRLF in three-way merge inputs

ci: run matrix on ubuntu + windows + macos

chore(gitignore): exclude Claude Code's ScheduleWakeup lock file

refactor: tighten merge engine per self-review

refactor(errors): type-safe ErrorCode union for ShardMindError

feat(drift): land orphan detection in v0.1 (closes #47)

refactor: review-pass cleanup (vault-paths consts, LINE_SPLIT, inline helper)

refactor: collapse review-pass dismissals after pushback

test(merge): edge-case fixtures — empty file, UTF-8, frontmatter merge

docs(spec): §4.8 and §4.9 reflect implementation reality

feat: property-based invariants + fix node-diff3 prototype-key crash

hardening: turn the merge engine upside down, fix 3 real bugs

chore(gitignore): exclude local fork clones (e.g. node-diff3)

Revert "chore(gitignore): exclude local fork clones (e.g. node-diff3)"

docs: track the node-diff3 workaround removal as a followup (#49)

fix: Copilot review round 2 — nine real findings