session recap · 2026-05-30

sonnet-4-6

Built a version-aware git merge driver for marketplace.json that auto-resolves version conflicts using max-semver logic and 3-way field merging — so concurrent PRs bumping different plugins never create manual conflicts again.

scripts/merge-marketplace.mjs: max(ours,theirs) semver + 3-way field merge preserves description, tags, source edits
.gitattributes + setup-merge-driver.sh — wires driver per-clone; SessionStart hook auto-registers in every Claude Code session
/code-review --fix (multi-agent) found 5 bugs: plugin resurrection, null version guards, dead base parse, redundant Set
Ultrareview caught non-version field data loss + duplicate plan file; fixed with mergeFields() 3-way approach
PR #193 merged to main; saved merge-driver workflow preference to project memory

305,296 tokens 71 min 97.1% cache hit 21 files 5 commits

Social media post

Just shipped a git merge driver that makes marketplace.json version conflicts disappear automatically.

The problem: every PR in this Claude Code plugin marketplace touches a single shared file (.claude-plugin/marketplace.json) to bump version numbers. When two PRs land concurrently, anyone rebasing hits the same version-conflict treadmill — repeatedly.

The fix: a dependency-free Node.js merge driver that runs during every git merge/rebase, resolving conflicts by keeping max(ours, theirs) per plugin semver. No textual conflict, no manual edit.

What this session built:
→ scripts/merge-marketplace.mjs — 3-way field merge preserves description/tags/source edits, not just version numbers
→ .gitattributes + setup-merge-driver.sh — wires the driver per-clone; SessionStart hook auto-registers it in every Claude Code session
→ /code-review --fix (multi-agent) found 5 bugs before merge: plugin resurrection, null version guards, dead base parse, redundant Set
→ Ultrareview surfaced 2 more: non-version field data loss (fixed with mergeFields()) + a duplicate plan file with a random slug
→ PR #193 merged to main — 305,296 tokens · 97.1% cache hit · 71 min · 5 commits

The interesting part: the review pipeline caught a real correctness bug I hadn't anticipated — without base, removing a plugin from one branch while the other still had it would silently resurrect it on merge.

Follow along for more git automation, AI-assisted code review patterns, and Claude Code tooling.

#ClaudeCode #GitAutomation #DeveloperTools #AIEngineering