Back-merge master into dev (conflicts need resolving) - #5242
Open
github-actions[bot] wants to merge 28 commits into
Open
Back-merge master into dev (conflicts need resolving)#5242github-actions[bot] wants to merge 28 commits into
github-actions[bot] wants to merge 28 commits into
Conversation
…ordering (#5216) Co-authored-by: Alexei Mochalov <alexei.a.mochalov@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Kevin Moore <kevinemoore@gmail.com> Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…5223) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…l back on an unusable config (#5215)
Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com>
…5236) Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Claude <noreply@anthropic.com>
Use QUILT_REGISTRY_URL when passing registry_url= to login_with_api_key(). Explain that the value is registryUrl from the catalog /config.json, not the catalog homepage. Update the Quickstart, authentication walkthrough, troubleshooting example, and migration example consistently.
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
…ent (#5279) Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
QuiltSimon
temporarily deployed
to
github-pages
September 3, 2026 20:12 — with 
GitHub Pages
Inactive
Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
QuiltSimon
temporarily deployed
to
github-pages
September 3, 2026 20:30 — with
GitHub Pages
Inactive
…#5281) Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com>
QuiltSimon
temporarily deployed
to
github-pages
September 4, 2026 01:49 — with
GitHub Pages
Inactive
… orphaned images (#5282) Co-authored-by: Simon Kohnstamm <kohnsts@gmail.com> 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
5 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.
Automated back-merge hit conflicts, so
devwas left untouched.Resolve locally and merge:
Until this lands,
masteris not an ancestor ofdevand the nextdev->mastermerge will conflict on every file the two brancheshave both touched. See
.github/workflows/back-merge-dev.yaml.