This repository was archived by the owner on Nov 12, 2026. It is now read-only.
Repository navigation
Sync main into dev (history only, tree unchanged) - #568
Merged
Merged
Conversation
Screen-share cost baseline: collector, reducer, protocol
main is the frozen stable line; #270 was merged here by mistake and is re-landed on dev. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Revert #270 from main (re-landing on dev)
377 generated files under rust/target were committed on main and checked out into every worktree. Remove them from the index (files stay on disk) and ignore the directory. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Stop tracking rust/target build output
main had 5 commits dev lacked (#270 and its revert, #284, #458). Conflicts in validate-mseries.yml, .gitignore and OS9-HANDOFF.md are resolved in favor of dev, and mseries/share-cost is kept: main reverted #270 because it belongs on dev. The tree is identical to dev; this only records main's history so dev is no longer behind main. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
BRANCHING.md says dev must never be behind main. main has 5 commits dev lacked (#270, its revert #284, #458 untrack rust/target). This merge records them in dev's history with the tree identical to dev: conflicts in validate-mseries.yml, .gitignore and OS9-HANDOFF.md resolve to dev, and mseries/share-cost is kept (main reverted #270 because it belongs on dev). Unblocks the dev to main release PR #567.
🤖 Generated with Claude Code