fix: default pr create next to merge

This commit is contained in:
Codex
2026-06-26 07:14:14 +00:00
parent 5fa5708fe1
commit cfd4f623af
2 changed files with 6 additions and 1 deletions
+2
View File
@@ -276,6 +276,8 @@ PR 正文
EOF
```
`pr create` 成功后的 Next 默认提示使用 `gh pr merge ... --merge --delete-branch`。只有确认不需要保留 ancestry 或 merge parent history 时,才显式改用 `--squash`
### 合并
```bash
+4 -1
View File
@@ -133,10 +133,13 @@ export function renderPrCreateTable(result: GitHubCommandResult): string {
"Next:",
];
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(" Use --squash only when ancestry and merge-parent history are intentionally disposable.");
} else {
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(" default view is a bounded table; use gh pr view/preflight --full for structured metadata.");