Skip to content

merge queue: checking main (a1d41dd) and #1729 together#1734

Closed
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/b095676a6a
Closed

merge queue: checking main (a1d41dd) and #1729 together#1734
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/b095676a6a

Conversation

@mergify

@mergify mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (a1d41dd) and #1729 are queued together for merge.

This pull request has been created by Mergify to check the mergeability of #1729.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

Required conditions to stay in the queue:

---
checking_base_sha: a1d41dd10f3068e09b9bd80bae9dc3fa693899d3
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 1729
    scopes: []
scopes: []
...

JulianMaurin and others added 2 commits July 20, 2026 17:19
A note is addressed by commit SHA, so every rewrite stranded it. The
rebase `stack push` runs before it reads notes back left the reason on
the pre-rebase SHA, and the revision history recorded a blank `Reason`;
a plain `git commit --amend` lost it the same way.

`stack setup` now adds a local `notes.rewriteRef`, which is what covers
the rewrites git runs on its own — `git commit --amend`, and the
`git rebase --continue` that finishes a conflicted rebase. The CLI's own
rebases pass the same settings with `-c` so they stay correct in
checkouts whose config predates this, and so a global
`notes.rewriteMode=ignore` cannot disable the copy. Existing checkouts
pick the config up on their next `mergify stack setup`.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Change-Id: I0e5503e0eeddcc02c689eb78581b8c211b2dd741
@mergify
mergify Bot deployed to Mergify Merge Protections July 21, 2026 07:36 Active
@mergify
mergify Bot temporarily deployed to func-tests-live July 21, 2026 07:36 Inactive
@mergify mergify Bot closed this Jul 21, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/b095676a6a branch July 21, 2026 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

1 participant