Originally created by: Akarsh-Hegde
Unblocks the pre-main → main promotion (#479), which GitHub reported as CONFLICTING.
main's chore(release): 1.71.0 [skip ci] (c52a9b11) bumped version strings in three files that [#468] deleted as part of the Rust-only + DMG-only change, producing modify/delete conflicts:
CONFLICT (modify/delete): npm/meridian-darwin-arm64/package.json
CONFLICT (modify/delete): npm/meridian/package.json
CONFLICT (modify/delete): services/pyproject.toml
Everything else auto-merged (Cargo.toml, Cargo.lock, ui/package.json, packages/meridian-mcp/package.json, tray/src-tauri/tauri.conf.json).
Git's default leaves the modified side in the tree, so a casual resolution - particularly in the GitHub web editor - would have resurrected the npm distribution and the Python runtime manifest on main, silently undoing part of [#468].
They would have come back as orphans: the workflows that consumed them (build-mlx-runtime.yml, services-version-bump.yml, runtime-gate-selftest.yml) are deleted on pre-main too. Dead files carrying a stale version bump.
The main-side change is only a release-bot version bump to files whose subsystem no longer exists, so there is nothing worth preserving.
Verified after resolution: git ls-files returns no npm/ or services/ entries - [#468]'s removal is intact.
main carried two commits pre-main did not (chore(release): 1.71.0 [skip ci] and its merge). This merge brings them across, restoring the main ⊆ pre-main invariant RUNBOOK documents.
tray/minimum-versionLeft armed at 1.71.0, deliberately. The decision is to ship the floor to production so every install below 1.71.0 force-updates to 1.72.0 without a consent prompt; [#480] (which would have disarmed it) is closed for that reason.
Versions in the tree read 1.71.0 after the merge - set-version.sh overwrites them to the computed release version during prepareCmd, so this does not pin the release.
🤖 Generated with Claude Code
Originally posted by: coderabbitai[bot]
✨ Finishing Touches
🧪 Generate unit tests (beta)
- [ ] Create PR with unit tests - [ ] Commit unit tests in branch `chore/reconcile-main-into-pre-main`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.
❤️ Share
- [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)Comment
@coderabbitai helpto get the list of available commands.Ticket changed by: Akarsh-Hegde