merge queue: checking main (a1d41dd) and #1729 together#1734
Closed
mergify[bot] wants to merge 2 commits into
Closed
merge queue: checking main (a1d41dd) and #1729 together#1734mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
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
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.
🎉 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
defaultfor merge:github-review-approved[🛡 GitHub branch protection] (documentation)github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch] (documentation)Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success=ci-gateRequired conditions to stay in the queue:
base=maingithub-review-approved[🛡 GitHub branch protection] (documentation)github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch] (documentation)label!=manual mergeEnforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success=ci-gate