fix: auto-wire field-aware merge driver on install (prepare hook) + pm-cli ^2026.7.21#6
Conversation
…2026.7.21 The .gitattributes merge-driver fence adopted in PR #5 is inert without the per-clone merge.<name>.driver git config. Add a guarded `prepare` (`if command -v pm; then pm merge install; fi`) so npm install/ci wires it automatically when pm is present and skips cleanly otherwise (e.g. --omit=dev); plus a merge:install script and a README note. Bump @unbrained/pm-cli devDep to ^2026.7.21 (driver requires 2026.7.20+) and sync the lockfile. Verified: with config unset, npm ci restores merge.pm-item-toon.driver; typecheck/test/changelog:check green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
Warning Review limit reached
Next review available in: 15 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (2)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
This repository has used its 100 free open-source review credits for this billing period. An organization admin can enable additional billed reviews, or reviews resume next period.
1 participant
Follow-up to #5 (which committed the
.gitattributesmerge-driver fence). The fence is inert without the per-clonemerge.<name>.drivergit config, so a fresh clone/CI falls back to Git text merge. Adds a guardedpreparescript (if command -v pm >/dev/null 2>&1; then pm merge install; fi) that auto-wires the config onnpm install/npm ciwhen pm is present and skips cleanly when it isn't (e.g.--omit=dev) — no|| true, so real errors surface. Adds amerge:installscript + README note, and bumps@unbrained/pm-clito ^2026.7.21. Verified: with config unset,npm cirestoresmerge.pm-item-toon.driver. Companion epic:pm-cli-website-juz0.Summary by cubic
Auto-installs the pm-cli field-aware Git merge driver on install so
.agents/pm/merges cleanly on fresh clones and CI. Adds a guardedpreparescript and amerge:installscript; updates README and bumps@unbrained/pm-clito^2026.7.21.Bug Fixes
pm merge installinpreparewhenpmis available; no-op otherwise.merge:installscript and README guidance.Dependencies
@unbrained/pm-clito^2026.7.21and sync lockfile.Written for commit 3741278. Summary will update on new commits.