merge-pull

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Translation

Chinese

Merge Pull Request

合并 Pull Request

Prefer

tea pulls

commands for merge workflows. Bundled actions are only for CLI gaps and are documented under

actions/pull-requests/README.md

When resolving

actions/...

paths, use the

actions/

directory bundled relative to this skill directory.

Pass explicit scope flags (

--login

--remote

, or

--repo

) to bundled actions when the user names a login, remote, backend, or repository. Otherwise, bundled actions use active-host-first discovery.

合并工作流优先使用

tea pulls

命令。内置操作仅用于弥补 CLI 的功能缺口，相关说明位于

actions/pull-requests/README.md

。

解析

actions/...

路径时，请使用相对于本 skill 目录内置的

actions/

目录。

当用户指定了登录名、远程仓库、后端或仓库时，请向内置操作传递明确的作用域标志（

--login

、

--remote

或

--repo

）。否则，内置操作将采用「活跃主机优先」的发现策略。

Merge

合并

bash

tea pulls merge 15                      # merge commit (default)
tea pulls merge 15 --style squash       # squash
tea pulls merge 15 --style rebase       # rebase
tea pulls merge 15 --style rebase-merge # rebase + merge commit
tea pulls merge 15 --style squash --title "feat: add auth" --message "Details"

bash

tea pulls merge 15                      # merge commit (default)
tea pulls merge 15 --style squash       # squash
tea pulls merge 15 --style rebase       # rebase
tea pulls merge 15 --style rebase-merge # rebase + merge commit
tea pulls merge 15 --style squash --title "feat: add auth" --message "Details"

Auto-Merge

The tea CLI does not expose auto-merge configuration. For the bundled action, see

actions/pull-requests/README.md

tea CLI 未提供 auto-merge 相关配置。有关内置操作的使用，请参见

actions/pull-requests/README.md

。

Mark WIP Ready

将 WIP 标记为就绪

If this repository uses

WIP:

titles as draft-like pull requests, remove the prefix with tea:

bash

tea pulls edit 15 --title "Feature"

如果该仓库使用带

WIP:

前缀的标题作为草稿类 pull requests，可以使用 tea 移除此前缀：

bash

tea pulls edit 15 --title "Feature"

Branch Cleanup

分支清理

bash

tea pulls clean 15         # delete local + remote branches after merge

bash

tea pulls clean 15         # delete local + remote branches after merge

Tips

提示

Merge styles:
```
merge
```
,
```
squash
```
,
```
rebase
```
,
```
rebase-merge
```

合并方式：
```
merge
```
、
```
squash
```
、
```
rebase
```
、
```
rebase-merge
```