Uh oh!
There was an error while loading. Please reload this page.
chore: back-merge main → develop after v0.9.0 promote (#266) - #318
Merged
Conversation
main - > enhance CLI features and tests
Reconcile ancestry so the next develop→main promote doesn't go CONFLICTING. main carries no unique code (only the promote merge commit); the tree is unchanged.
LukasWodka
approved these changes
Jul 14, 2026
LukasWodka
commented
Jul 14, 2026
Contributor
👋 Heads-up — Code review queue is at 55 / 30 Above the WIP limit. The team convention is to review existing PRs before opening new work. Open PRs currently in Code review (oldest first):
Pull from review before opening new work. (This is a nudge from the kanban WIP check, not a block.) |
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reconciles ancestry after the #266
develop → mainpromote so the next promote PR doesn't goCONFLICTING(the recurring release-drift issue —main's promote/merge commits accrue outside develop's ancestry).maincarries no unique code, only the promote merge commit. Verified the merge tree ==origin/maintree ==origin/developtree (90e44961…).Nothing to test — the working tree is byte-identical to current develop.
🤖 Generated with Claude Code
Note
Low Risk
No file or behavioral changes; merge commit for branch ancestry only.
Overview
Git-history only: merges
mainback intodevelopafter the v0.9.0 promote (#266) so the nextdevelop → mainpromote does not hit recurring ancestry/CONFLICTINGdrift from promote commits living only onmain.There is no application or config diff—the working tree matches current
develop/main(per PR verification). This only adds the promote merge commit todevelop's history.Reviewed by Cursor Bugbot for commit c289f56. Bugbot is set up for automated code reviews on this repo. Configure here.