mirrors/pikasTech-unidesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #994 from pikasTech/fix/993-gh-pr-create-merge-next

Browse Source 
fix: gh pr create Next 默认使用 merge
This commit is contained in:
Lyon
2026-06-26 15:15:09 +08:00
committed by GitHub
parent 5fa5708fe1 cfd4f623af
commit 914f053bd0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.agents/skills/unidesk-gh/SKILL.md
+2
View File
@@ -276,6 +276,8 @@ PR 正文
EOF EOF
``` ```
`pr create` 成功后的 Next 默认提示使用 `gh pr merge ... --merge --delete-branch`。只有确认不需要保留 ancestry 或 merge parent history 时，才显式改用 `--squash`。
### 合并 ### 合并
```bash ```bash
scripts/src/gh/pr-commands.ts
+4 -1
View File
@@ -133,10 +133,13 @@ export function renderPrCreateTable(result: GitHubCommandResult): string {
"Next:", "Next:",
]; ];
if (status === "created" && number !== "-") { if (status === "created" && number !== "-") {
lines.push(` bun scripts/cli.ts gh pr merge ${number} --repo ${ghText(result.repo)} --squash --delete-branch`); lines.push(` bun scripts/cli.ts gh pr merge ${number} --repo ${ghText(result.repo)} --merge --delete-branch`);
lines.push(` bun scripts/cli.ts gh pr preflight ${number} --repo ${ghText(result.repo)} --full`); lines.push(` bun scripts/cli.ts gh pr preflight ${number} --repo ${ghText(result.repo)} --full`);
lines.push(" Use --squash only when ancestry and merge-parent history are intentionally disposable.");
} else { } else {
lines.push(" rerun without --dry-run to create the PR"); lines.push(" rerun without --dry-run to create the PR");
lines.push(` after creation: bun scripts/cli.ts gh pr merge <pr-number> --repo ${ghText(result.repo)} --merge --delete-branch`);
lines.push(" Use --squash only when ancestry and merge-parent history are intentionally disposable.");
} }
lines.push("", "Disclosure:"); lines.push("", "Disclosure:");
lines.push(" default view is a bounded table; use gh pr view/preflight --full for structured metadata."); lines.push(" default view is a bounded table; use gh pr view/preflight --full for structured metadata.");