chore: sync main into develop after manual - #173
Closed
github-actions[bot] wants to merge 2 commits into
Closed
Conversation
Collaborator
|
Superseded by chore/sync-develop-after-0.9.19 — merges main into develop with conflict resolution and updated sync workflow. |
4 tasks
forcemeter
pushed a commit
to forcemeter/Octop-Agent
that referenced
this pull request
Aug 7, 2026
Resolve merge conflicts by taking main's release metadata (CHANGELOG, uv.lock). Replaces the conflicting main→develop sync PR TencentCloud#173. Co-authored-by: Cursor <cursoragent@cursor.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.
Post-release sync so develop contains the shipped main tip (manual).