Skip to content

Commit dcb31e7

Browse files
committed
Point the stacked-PR link at the current GitHub docs page
The linked URL 404s; add the use case to the skill description so the skill is found when a stack's bottom layer has merged.
1 parent fa73ec0 commit dcb31e7

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

‎skills/magic-merge-commit/SKILL.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: magic-merge-commit
33
description: Fix a Git merge conflict caused by a squash-merged base branch. Use
44
when a PR can't merge `main` cleanly because its base branch was squash-merged,
55
and Git sees the old commits as conflicting with the squashed commit in `main`.
6+
Typical for GitHub stacked pull requests after the bottom layer merged.
67
Creates a "magic" merge commit linking the branch to the squashed history.
78
---
89

@@ -22,7 +23,7 @@ All of the following are true:
2223
- That other PR was **squash-merged** into `main`.
2324
- Merging `main` into the current branch now conflicts.
2425

25-
Typical case: a [GitHub stacked pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-stacked-pull-requests).
26+
Typical case: a [GitHub stacked pull request](https://docs.github.com/en/pull-requests/get-started/about-stacked-prs).
2627
The bottom layer gets squash-merged into `main`, and the layer above it — whose
2728
branch still carries the pre-squash commits — no longer merges `main` cleanly.
2829
Run this skill in the upper layer's worktree with the bottom PR's number.

0 commit comments

Comments
 (0)