merge queue: embarking main (9c2de62) and #1115 together#1129
Closed
mergify[bot] wants to merge 3 commits intomainfrom
Closed
merge queue: embarking main (9c2de62) and #1115 together#1129mergify[bot] wants to merge 3 commits intomainfrom
mergify[bot] wants to merge 3 commits intomainfrom
Conversation
Adds AGENTS.md with CLI output style guideline: prefer compact Unicode symbols (✓ ✗ ● ○ —) over emoji for consistent terminal rendering. Replaces all emoji in the stack module (setup.py, pre-push.sh) with the compact symbols to match the queue module's existing style. Change-Id: Ie9a1cbe04ce1abdd5866e9f7de6d7000e95b9675 Claude-Session-Id: 2d9f4a52-4a1d-4a50-a459-3b57847dec9f
Adds smart_rebase() that detects merged PRs via the GitHub API and handles them during rebase. If merged commits are found, it does a single `git rebase -i` that both drops them and rebases onto trunk, avoiding conflicts from PRs modified on GitHub before merge. If no commits are merged, falls back to simple `git pull --rebase`. Integrated into `mergify stack push` during its rebase step. Change-Id: If517fa97f6ed588bf1f2782aa14a1411936c9379 Claude-Session-Id: 2d9f4a52-4a1d-4a50-a459-3b57847dec9f
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
1 participant
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 (9c2de62) and #1115 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #1115.
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:title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gateRequired conditions to stay in the queue:
base=mainlabel!=manual mergetitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]body ~= (?ms:.{48,})#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success=ci-gate