chore: back-merge main into develop after v0.10.0 promote - #416
Merged
shujaatTracebloc merged 3 commits intoJul 27, 2026
Conversation
main -> release
Release develop → main
Reconciles ancestry after the develop→main promote (#397, tag v0.10.0). main carries only promote snapshot merges; trees are identical, so this is a content-free ancestry fix to stop develop/main from diverging on the next promote. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
shujaatTracebloc
approved these changes
Jul 27, 2026
shujaatTracebloc
left a comment
shujaatTracebloc
left a comment
Contributor
There was a problem hiding this comment.
Reviewed. Content-free back-merge — gh pr diff is empty and the branch tree == origin/develop (5af8f6c), so no source changes; only ancestry is reconciled after the v0.10.0 promote. Correct per the release-drift convention. CI green, Bugbot clean.
Important for whoever merges: land this as a real MERGE commit (not squash) — squashing drops main's promote merges (#387/#397) from develop's ancestry and future develop→main promotes stay CONFLICTING.
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Ancestry reconciliation (main → develop)
After the
develop → mainpromote (#397, tagv0.10.0),maincarries two promote snapshot merges (#387, #397) that are not in develop's ancestry. Left alone, this drift makes every futuredevelop → mainpromote PR goCONFLICTING.This back-merge brings those merge commits into develop's ancestry. It is content-free — the resulting tree equals
origin/develop(5af8f6c), so no source files change; only history is reconciled.Verification
mainhas no unique code, only promote snapshots== origin/develop^{tree}(5af8f6c)Durable fix per the release-drift convention: back-merge
main → developafter each promote.🤖 Generated with Claude Code
Note
Low Risk
No file or behavioral changes—only git history alignment after a release promote.
Overview
History-only merge — reconciles
develop’s ancestry withmainafter the v0.10.0 promote (#397), so futuredevelop → mainPRs are not stuck in a perpetual CONFLICTING state.mainhad promote snapshot merges (#387, #397) that were not ancestors ofdevelop. This back-merge pulls those commits intodevelop’s history without changing the tree (content matchesorigin/developat5af8f6c).No application, config, or workflow files are modified; only git graph alignment per the release-drift convention (back-merge
main → developafter each promote).Reviewed by Cursor Bugbot for commit 249b8ab. Bugbot is set up for automated code reviews on this repo. Configure here.