Repository navigation
fix(web): say that auto-merge also merges commits pushed after it is on - #596
Merged
Merged
Conversation
The auto-merge confirmation said when the merge would happen but not what it would include. GitHub keeps auto-merge on when someone with write access pushes, and merges the newer head, so the dialog and the source control guide now say that later commits are merged too unless the host turns auto-merge off.
16 tasks
incognitojam
pushed a commit
that referenced
this pull request
Oct 16, 2026
…#15851) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Fork adaptation: Quick merges now resolve the merge method inside the shared client runtime's action lane. The fork's head guard moves with it: the runtime sends the head commit from its fresh detail read as `expectedHeadSha`, so GitHub refuses the merge if new commits arrived since. The fork-only quick-action test is replaced by a runtime test for that, and the ledger paths follow. The user guide keeps the fork's sentence that auto-merge also merges commits pushed after it is on (fork #596) beside upstream's new quick-action paragraph. (cherry picked from commit 7ffa218) Upstream-PR: 15851 Fork-Feature: pull-request-merge-head-guard
incognitojam
pushed a commit
that referenced
this pull request
Oct 16, 2026
…#15851) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Fork adaptation: Quick merges now resolve the merge method inside the shared client runtime's action lane. The fork's head guard moves with it: the runtime sends the head commit from its fresh detail read as `expectedHeadSha`, so GitHub refuses the merge if new commits arrived since. The fork-only quick-action test is replaced by a runtime test for that, and the ledger paths follow. The user guide keeps the fork's sentence that auto-merge also merges commits pushed after it is on (fork #596) beside upstream's new quick-action paragraph. (cherry picked from commit 7ffa218) Upstream-PR: 15851 Fork-Feature: pull-request-merge-head-guard
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.
The auto-merge confirmation said when the merge would happen but not what it would include. On GitHub, auto-merge stays on when someone with write access pushes to the branch, and the newer head is merged once it is ready. A reader could reasonably assume the merge covers only what they reviewed when they confirmed.
Change
docs/user/source-control.mdsays the same.Validation
enable-auto-mergeto that pull request's viewer permissions in the response before it reached the page. That made the menu entry appear. The dialog was cancelled, and the pull request has no auto-merge request.Written by an agent (Claude Code, claude-opus-5-5).