chore: sync develop onto main after 0.9.19 - #177
Merged
Conversation
Resolve merge conflicts by taking main's release metadata (CHANGELOG, uv.lock). Replaces the conflicting main→develop sync PR #173. Co-authored-by: Cursor <cursoragent@cursor.com>
Document no develop→main bulk merges and no squash on release PRs. Update sync workflow to rebuild on conflict and open chore/sync PRs when develop branch protection blocks direct push. 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
2 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.
Summary
main(0.9.19) intodevelop, resolving CHANGELOG/uv.lock conflicts by taking main's release metadata.mainas an ancestor ofdevelop(fixes the diverged history from Develop #150 / conflicting sync PR chore: sync main into develop after manual #173).sync-main-to-develop.ymlto merge-first, rebuild-on-conflict, and openchore/sync-develop-after-*PRs when branch protection blocks push.develop→mainbulk merges; release PRs use merge commits (not squash).Test plan
make allgreen locally (pre-commit on both commits)git merge-base --is-ancestor origin/main HEADpasses on this branchdevelopMade with Cursor