Skip to content

merge queue: checking #5042 on main (93c2c8c) - #5050

Closed
mergify[bot] wants to merge 4 commits into
mainfrom
mergify/merge-queue/7ed263e034
Closed

merge queue: checking #5042 on main (93c2c8c)#5050
mergify[bot] wants to merge 4 commits into
mainfrom
mergify/merge-queue/7ed263e034

Conversation

@mergify

@mergify mergify Bot commented Oct 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Note

This is a merge queue draft opened by Mergify. Nobody needs to act on it.
Mergify opened it for batch growing-merveilleux-ztku2y of the default queue, to test #5042 before it merges into main. Pushing to this branch or closing this pull request removes #5042 from the queue.

What this draft tests

Mergify checks that #5042 still passes CI on top of main. CI runs on this draft's code, built in this order:

  1. main at 93c2c8c
  2. #5042, the pull request of this batch

🎉 Where it stands: checks passed

CI passed on this draft.

Follow the default queue in the dashboard

What happens next

  • Mergify merges #5042 into main and closes this draft.
Metadata for CI tooling, read by mergify ci 
---
all_scopes: false
checking_base_sha: 93c2c8c29668b456e51f58dc84b0a4a42f66979b
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 5042
    scopes: []
scopes: []
...
Required conditions of queue rule default for merge
Required conditions to stay in the queue

cursoragent and others added 4 commits October 16, 2026 11:55
@cursoragent @tmchow
fix(cli): dependent sync name must not collide with top-level resource
4c5fdec 
A dependent whose name matches a top-level sync resource was left unchanged
when it was unique among dependents. flatSyncResources then dropped that
top-level resource from the sync plan and reported success with no rows.

Rename those singletons the same way as duplicate dependents, and fail
generation if a dependent name still collides with a top-level resource.

Closes #5039

Co-authored-by: Trevin Chow <tmchow@users.noreply.github.com>
@cursoragent @tmchow
fix(cli): reserve unresolved sync names before dependent rename
a98a65a 
Dependent names were chosen before unresolved path-template collections
joined the syncable set, so a renamed dependent could take that
collection's name and generation aborted. Register those collections
first so the rename pass treats the names as taken.

Co-authored-by: Trevin Chow <tmchow@users.noreply.github.com>
@cursoragent @tmchow
test(cli): compile unresolved dependent sync collision fixture
482f1e4 
requireGeneratedCompiles now builds the generated module for the
unresolved-collection fixture, which checks the emitted sync helper
and dependent definitions.

Co-authored-by: Trevin Chow <tmchow@users.noreply.github.com>
@mergify @mergify-commit-signer
Merge of #5042
e5a3a4a
@mergify mergify Bot closed this Oct 16, 2026
@mergify mergify Bot mentioned this pull request Oct 16, 2026
Merged
@mergify
mergify Bot deleted the mergify/merge-queue/7ed263e034 branch October 16, 2026 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@cursoragent