From e5584bee80bf86c714385bfa251ac7403a948498 Mon Sep 17 00:00:00 2001 From: Jeffery Date: Tue, 25 Aug 2026 11:58:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(pr):=20base=20=E5=88=86=E6=94=AF=E5=84=AA?= =?UTF-8?q?=E5=85=88=E6=8E=A1=E7=94=A8=E5=91=BC=E5=8F=AB=E7=AB=AF=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=80=BC=EF=BC=8C=E4=B8=8D=E5=86=8D=E8=87=AA=E8=A1=8C?= =?UTF-8?q?=E9=80=80=E5=9B=9E=20develop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5 (1M context) --- skills/pr/SKILL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skills/pr/SKILL.md b/skills/pr/SKILL.md index c8b27d2..5911714 100644 --- a/skills/pr/SKILL.md +++ b/skills/pr/SKILL.md @@ -1,6 +1,6 @@ --- name: pr -description: Commit all changes via jsc-git:commit, create a target branch named from the highest-priority commit type plus a summarized title, push, then open a Gitea PR with the templated description. Branch priority is revert > fix > feat > perf > refactor > test > docs > style > chore. Use when work is ready for review; not for plain commits. +description: Commit all changes via jsc-git:commit, create a target branch named from the highest-priority commit type plus a summarized title, push, then open a Gitea PR with the templated description against the base branch the caller passed in (falling back to develop, main, master only when none was given). Branch priority is revert > fix > feat > perf > refactor > test > docs > style > chore. Use when work is ready for review; not for plain commits. --- # pr — create a Push Request @@ -8,7 +8,7 @@ description: Commit all changes via jsc-git:commit, create a target branch named ## Steps 1. Call `jsc-git:commit` to commit every file change first. -2. Pick the base branch: use `develop` when it exists on the remote, else `main`, else `master`. +2. Pick the base branch. **A base branch passed in by the caller wins over everything else** — `jsc-sdlc:implement` passes the analysis page's source branch, and silently retargeting that PR at `develop` would merge a single work package straight past the feature branch it belongs to. Only when no caller supplied one: use `develop` when it exists on the remote, else `main`, else `master`. Verify the chosen base exists on the remote (`git fetch --prune origin` first, then `git branch -r`); it does not exist → report and stop, never fall back silently. 3. Create the target branch from the remote base branch: 1. Take the type with the highest priority across all commits: `revert > fix > feat > perf > refactor > test > docs > style > chore`. 2. Summarize one title from all commit messages.