Skip to content

chore(sync): reconcile main into dev/v0.16 after the cask promotion - #378

Merged
scttbnsn merged 3 commits into
dev/v0.16from
chore/sync-main-after-0192-cask
Oct 26, 2026
Merged

scttbnsn merged 3 commits into
dev/v0.16from
chore/sync-main-after-0192-cask

Conversation

@scttbnsn

Copy link
Copy Markdown
Contributor

An -s ours merge of main into dev/v0.16 so promotion PR #377 isn't BEHIND. It brings the #371 and #375 promotion merge commits into dev's history and changes no files. Merge it with a merge commit, not a squash, so the second parent survives.

@vercel

vercel Bot commented Oct 26, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
careerrat-website Ready Ready Preview Oct 26, 2026 3:40am UTC

@coderabbitai

coderabbitai Bot commented Oct 26, 2026

Copy link
Copy Markdown

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

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
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

Comment @coderabbitai help to get the list of available commands.

@biggest-littlest biggest-littlest left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving cb9a45f: -s ours reconcile, no file changes, checks green.

@ALARGECOMPANY ALARGECOMPANY left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving cb9a45f: -s ours reconcile, no file changes, checks green.

@scttbnsn scttbnsn closed this Oct 26, 2026
@scttbnsn
scttbnsn deleted the chore/sync-main-after-0192-cask branch October 26, 2026 04:13
@scttbnsn
scttbnsn restored the chore/sync-main-after-0192-cask branch October 26, 2026 04:13
@scttbnsn scttbnsn reopened this Oct 26, 2026
@scttbnsn
scttbnsn merged commit af6cf27 into dev/v0.16 Oct 26, 2026
38 of 39 checks passed
@scttbnsn
scttbnsn deleted the chore/sync-main-after-0192-cask branch October 26, 2026 04:22

This branch was successfully deployed

1 active deployment
Preview — cb9a45f7 Deployed Oct 26, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants