#533 ci: merge main into pre-main to clear the ci.yml conflict for #528

[Anonymous]

Originally created by: Akarsh-Hegde

Summary

Clears the single remaining pre-main ↔ main conflict that's been blocking Meridiona/meridian#528 (pre-main → main), by merging main into pre-main.

The conflict

Only .github/workflows/ci.yml conflicted — both branches independently edited the same comment lines:

• The wording describing the (now-removed) [skip ci] marker. main still says the version-bump commit "carries" it; pre-main already corrected this to "used to carry" via [#526], since the marker was removed. Kept pre-main's wording.
• The screenpipe MIT-pin expected hash. pre-main has the newer 064c44cc… (#524's sck-rs-universal-disable fix); main still has the older 825b038d…. Kept pre-main's hash.

Why a real merge, not a trick

Two alternatives were considered and rejected:

• An "ours"-only resolution (keep pre-main's tree, discard main's content, but still record main as a parent) would make main's tip the new merge-base. Since pre-main's Cargo.toml/CHANGELOG.md would then read older than that base, the next real merge would look like pre-main unilaterally downgrading main's version — a silent regression on the one branch that must never regress.
• Not merging at all leaves the conflict for a human to resolve locally at [#528]'s merge time.

A real merge avoids the landmine above. The only side effect: main's version-bump bookkeeping (CHANGELOG.md, Cargo.toml, package.jsons, tauri.conf.json — all bumped to 1.74.0) now also lands on pre-main. This is inert here — pre-main stamps its build version from the tag at build time, not from Cargo.toml (per [#526]) — so it's noise, not a behavior change.

Verified

• No stray conflict markers anywhere (grep'd the full merge).
• ci.yml diffed against main: differs only in the two hunks above — nothing else drifted.
• Full pre-push suite green: fmt, clippy, UI build, UI tests, cargo test.

After this merges

[#528] should go from CONFLICTING to MERGEABLE. Still merge [#528] with a merge commit, not squash (per afb5e631 / release-prepare.yml's own guard against exactly that failure mode).

[Anonymous]

Originally posted by: coderabbitai[bot]

[!IMPORTANT]

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 1374d41c-2114-4974-a6f6-2425134f157a

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:
- [ ] 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

- [ ] Create PR with unit tests - [ ] Commit unit tests in branch `ci/merge-main-resolve-528-conflict`

---

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 help to get the list of available commands.}

[Anonymous]

Ticket changed by: Akarsh-Hegde

• status: open --> closed