Skip to content

Fast-forward dev onto main - #1913

Merged
lidge-jun merged 21 commits into
devfrom
ff-dev
Aug 17, 2026
Merged

Fast-forward dev onto main#1913
lidge-jun merged 21 commits into
devfrom
ff-dev

Conversation

@lidge-jun

@lidge-jun lidge-jun commented Aug 17, 2026

Copy link
Copy Markdown
Owner

Summary

Fast-forwards dev onto main, so the integration branch carries the promotion merges instead of trailing them.

dev is already an ancestor of maingit merge-base --is-ancestor origin/dev origin/main exits 0 — so this contributes no new source changes. It only brings across the promotion and release commits (#1908, #1910, and the release bumps back to v2.18.0) that landed on main and were never replayed onto dev.

Without this, the next PR branched from dev starts 21 commits behind main and every promotion re-diffs the same history.

Verification

  • git merge-base --is-ancestor origin/dev origin/main → exit 0 (pure fast-forward, no divergence).
  • git rev-list --count origin/main..origin/dev → 0 (dev is ahead by nothing).
  • No file changes: the diff against main is empty by construction.

Checklist

  • Scope stays focused and avoids unrelated cleanup.
  • Docs or release notes were updated when needed.
  • Security-sensitive changes were reviewed for secrets, auth, and unsafe defaults.

Summary by CodeRabbit

  • Chores
    • Updated the application version to 2.24.1.

@lidge-jun
lidge-jun requested a review from Ingwannu as a code owner August 17, 2026 10:30
@github-actions

Copy link
Copy Markdown
Contributor

Deterministic PR hygiene checks passed.

@lidge-jun
lidge-jun merged commit 1208bd2 into dev Aug 17, 2026
200 of 206 checks passed
@coderabbitai

coderabbitai Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Caution

Review failed

The pull request is closed.

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: 85c7d550-4e27-483b-94e5-92729f1e9330

📥 Commits

Reviewing files that changed from the base of the PR and between b1708ac and db39cfb.

📒 Files selected for processing (1)
  • package.json

📝 Walkthrough

Walkthrough

The package version in package.json changes from 2.18.0 to 2.24.1. No exported or public declarations change.

Changes

Package version update

Layer / File(s) Summary
Update package version
package.json:3
The package version changes from 2.18.0 to 2.24.1.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Suggested reviewers: ingwannu

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch ff-dev

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.

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.

1 participant