Repository navigation
Merge main into feat/054-connector-boundary - #297
Merged
Merged
Conversation
Records #284 (Maximum Packet Size in the embedded CONNECT) as merged. Its content already reached the feature branch through #295, whose squash dropped the merge parent, so #296 conflicts with main. The resolution keeps the feature branch's side; the tree is unchanged. Co-Authored-By: Claude Opus 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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Unblocks #296, which conflicts with
main.#295 brought
main(#284, Maximum Packet Size in the embedded CONNECT) into the feature branch. Squash-merging it turned that merge into ordinary changes, so git does not see #284 as merged and #296 conflicts insession_loop.rsandtokio_broker.rs.This PR records the merge again. The resolution keeps the feature branch's side, so no file changes: the tree is identical to
feat/054-connector-boundary.Please merge this with "Create a merge commit", not squash. A squash would drop the
mainparent again and #296 would stay conflicting.🤖 Generated with Claude Code