Conversation
Merge ProtectionsYour pull request matches the following merge protections and will not be merged until they are valid. 🔴 👀 Review RequirementsWaiting for:
or
or
or
This rule is failing.
🔴 🔎 ReviewsWaiting for:
This rule is failing.
🟢 🤖 Continuous IntegrationWonderful, this rule succeeded.
🟢 Enforce conventional commitWonderful, this rule succeeded.Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/
🟢 📕 PR descriptionWonderful, this rule succeeded.
|
f6b1cdf to
82f01a2
Compare
fdd8a2d to
06101a3
Compare
82f01a2 to
6456b6d
Compare
6456b6d to
9a98892
Compare
There was a problem hiding this comment.
Pull request overview
Adds a new mergify stack sync workflow entrypoint to keep a local stack branch aligned with trunk by leveraging the existing smart_rebase logic (including dropping commits whose PRs have already been merged), plus documentation and integration tests to validate behavior.
Changes:
- Introduces
stack_sync()inmergify_cli/stack/sync.pyto fetch trunk, run the smart rebase flow, and print user-facing status (with--dry-runsupport). - Wires a new
mergify stack syncClick subcommand into the stack CLI. - Adds integration-style tests for sync scenarios (up-to-date, merged commits dropped, all merged, dry-run) and updates the stack workflow skill docs.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
mergify_cli/stack/sync.py |
Adds stack_sync() wrapper around fetch + smart_rebase() with user-facing output and --dry-run. |
mergify_cli/stack/cli.py |
Adds mergify stack sync command and forwards basic options to stack_sync(). |
mergify_cli/tests/stack/test_sync.py |
Adds integration tests covering the new sync behavior and output. |
mergify_cli/stack/skill.md |
Documents the new mergify stack sync command and recommended usage. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@jd this pull request is now in conflict 😩 |
9a98892 to
7dc6609
Compare
Merge Queue Status
This pull request spent 5 seconds in the queue, with no time running CI. ReasonThe pull request conflicts with pull requests ahead in queue: #1133 HintThere is nothing you can do for now. If the pull request ahead in the queue is merged, this pull request will become conflicting and you'll have to update it. |
|
@jd this pull request is now in conflict 😩 |
7dc6609 to
515e148
Compare
Pull request has been modified.
Exposes the smart_rebase algorithm as `mergify stack sync`, which fetches trunk, detects merged PRs, drops them, and rebases in one step. Supports --dry-run to preview what would happen. Change-Id: I14bca20f08f8fcd5d265c86ebd5e1fd2eac688c6 Claude-Session-Id: 2d9f4a52-4a1d-4a50-a459-3b57847dec9f
515e148 to
f0e7332
Compare
Exposes the smart_rebase algorithm as
mergify stack sync, whichfetches trunk, detects merged PRs, drops them, and rebases in one
step. Supports --dry-run to preview what would happen.
Claude-Session-Id: 2d9f4a52-4a1d-4a50-a459-3b57847dec9f