Skip to content

chore(repo): back-merge main into dev after v0.2.17 release (#270)#271

Merged
w7-mgfcode merged 3 commits into
devfrom
chore/back-merge-main-v0-2-17
May 20, 2026
Merged

chore(repo): back-merge main into dev after v0.2.17 release (#270)#271
w7-mgfcode merged 3 commits into
devfrom
chore/back-merge-main-v0-2-17

Conversation

@w7-mgfcode
Copy link
Copy Markdown
Owner

Post-release back-merge for v0.2.17.

Closes #270.

⚠️ MERGE WITH `--merge`, NOT SQUASH

Per memory `back-merge-needs-merge-commit` and the v0.2.16 precedent (#255):

gh pr merge 271 --merge   # ← when CI is green; do NOT use --squash / --rebase

Squashing the back-merge flattens the two-parent merge commit so main never becomes an ancestor of dev, and the next dev → main release PR keeps re-conflicting on the release-please version files.

What's in this PR

The diff is exactly the release-please commit on main for v0.2.17:

  • CHANGELOG.md## [0.2.17] section
  • pyproject.toml — version bump
  • .release-please-manifest.json".": "0.2.17"

Nothing else. No new feature work.

Verify after merge

git fetch origin
git rev-list --parents -n 1 origin/dev | tr ' ' '\n' | wc -l   # expect 3 (commit + 2 parents)
git merge-base --is-ancestor origin/main origin/dev && echo OK # expect OK

release: prepare v0.2.17 — MLZOO-D + dogfood automation + cross-slice import pattern
…n--components--forecastlabai

chore(main): release 0.2.17
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 20, 2026

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: defaults

Review profile: CHILL

Plan: Pro

Run ID: c7215a4d-6d6a-4568-8f9c-c899bfbade5c

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 chore/back-merge-main-v0-2-17

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 and usage tips.

Copy link
Copy Markdown

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Sorry @w7-mgfcode, you have reached your weekly rate limit of 500000 diff characters.

Please try again later or upgrade to continue using Sourcery

@w7-mgfcode w7-mgfcode merged commit 6fcb404 into dev May 20, 2026
15 checks passed
@w7-mgfcode w7-mgfcode deleted the chore/back-merge-main-v0-2-17 branch May 20, 2026 03:26
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