Repository navigation
Merge main into v2/main so main-source.yml shares history - #5172
Merged
Merged
Conversation
CONTRIBUTING.md, the PR template and the issue forms, byte-identical to v2/main, so the default branch states the issues-not-PRs policy before external pull requests are turned off. Nothing else changes and nothing is released. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
Takes CONTRIBUTING.md from v2/main, which dropped the transitional blank-issue fallback (#4940), so this branch stays byte-identical to v2/main and main does not receive the stale sentence. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
Takes .github/pull_request_template.md from v2/main, which reduced it to the issues-not-PRs banner (#4960), so this branch stays byte-identical to v2/main. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
Takes .github/ISSUE_TEMPLATE/1-bug_report.yml from v2/main, whose Server version placeholder now shows both version schemes (#4964), so this branch stays byte-identical to v2/main. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
…ribution-policy-to-main chore: bring the contribution policy to main ahead of the v2.0.0 merge
Brings main's CONTRIBUTING.md byte-identical to v2/main's, so the v1.0.0 milestone merge (#5080) produces v2/main's tree without a conflict. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
…ributing-sync-to-main docs(contributing): sync main with v2/main ahead of the v1.0.0 merge
…ase-v1.0.0-sdk1 Release v1.0.0: merge v2/release/1.0.0 into main
…erge The guard (#5119, PR #5120 on v2/main) runs on pull_request_target, which loads the workflow and script from main. Bring the same three files here byte-for-byte, so the check can run on, and be required for, PRs into main before the next milestone merge carries them. Part of #5119 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
…-source-bootstrap ci: bring the main-source guard to main (bootstrap for #5119)
main-source.yml was added to main directly (f39bc6b, #5122) and to v2/main separately, so the two copies have no common ancestor and the milestone merge conflicts as soon as they differ. The conflict is resolved to main's copy here; the next commit re-applies #5169's node-version: 24. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
Re-applies #5169's change to main-source.yml on top of the merge with main, so it reaches main as an ordinary change to a shared file. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: cliffhall <cliff@futurescale.com>
|
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request. Check if the Files changed in this pull request are included in default exclusions.
Member
Author
|
Copilot round 1: no review possible. The PR has no net file changes (it carries history only), so Copilot had no files to look at. The loop stops here: a re-request would see the same empty diff. CI: 34 pass, 4 skipped. |
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
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.
Closes #5171
Important
Merge with "Create a merge commit", not rebase. The point of this PR is the shared history; a rebase drops it and the conflict comes back.
Merges
origin/mainintov2/main, so thatmain-source.ymlhas a common ancestor on both branches and the v2.0.0 merge (#5166) is clean again.Why
main-source.ymlwas committed tomaindirectly (f39bc6bb, ci: bring the main-source guard to main (bootstrap for #5119) #5122) and added tov2/mainseparately. The last commit the two branches share is the v1.0.0 merge (89701afa), which doesn't have the file.v2/main's copy tonode-version: 24, sogit merge-tree --write-tree origin/main origin/v2/mainbegan reporting an add/add conflict.Commits
99b11a4a: mergesorigin/main. The only conflict,main-source.yml, is resolved tomain's copy (node-version: 22). The other main-only commits (contribution-policy syncs, the main-source bootstrap, the v1.0.0 merge commits) bring no content change.306f5a40: re-applies fix: raise the TypeScript servers' Node floor to 24 #5169'snode-version: 24tomain-source.yml.How Has This Been Tested?
This change has no client-visible surface; it changes history only. Targeted probes:
git diff origin/v2/main HEADis empty. This branch's tree is76323f50, identical toorigin/v2/main's.git merge-base --is-ancestor origin/main HEADsucceeds, so everymaincommit is now in this branch.git merge-tree --write-tree origin/main HEADprints76323f50with no conflict. Merging intomainwould yield exactlyv2/main's tree.npm run local:gateon Node 24.20.0 exits 0.verify:dcoreports "12 commits in origin/v2/main..HEAD, all signed off or exempt".Checklist
🤖 Generated with Claude Code