跳到正文
cccskills
免费在 GitHub 公开

merge

Prepare and merge a specific EspControl pull request by addressing remaining review feedback, resolving conflicts with main, and merging only when required reviews and checks are clear. Use when the user says "/merge" or asks to get a pull request ready and merge it.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol星标 1,120(GitHub 1,120 + cccskills 0)

实测评分 未实测

查看安装方法

包含的文件(2)

  • SKILL.md5.4 KB
  • agents/openai.yaml259 B

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

/merge

Goal

Take one identified pull request through the repository's final review and conflict-resolution workflows, then merge it when GitHub reports that it is ready. Invoking this skill authorizes the merge attempt for that pull request; it does not authorize bypassing protections, merging unrelated work, closing issues, or claiming that physical device testing occurred.

Workflow

1. Identify One Pull Request

Use the PR number or URL supplied by the user or the single PR clearly identified by the current chat. If there is not exactly one PR with confidence, stop and ask for its number or URL. Do not select one by recency, branch, or the open PR list.

Record the PR's URL, title, base and head branches, draft state, review decision, merge state, and checks. Keep the same PR number through every stage below.

2. Clear Review Feedback

Read and follow the pr-review skill completely for the identified PR. Address and push all actionable unresolved feedback and resolve only the threads that were actually addressed.

Do not continue toward merge if actionable feedback remains, a requested change is intentionally left open, or the review workflow cannot safely complete. Report what blocks the merge instead.

3. Update the Branch and Resolve Conflicts

After review feedback is clear, read and follow the resolve-pr-conflicts skill completely for the same PR. Bring the latest base branch into the PR branch and resolve any conflicts, preserving both the PR's intent and newer base-branch changes. Push the result.

The nested skill normally leaves a PR open; for this /merge workflow, continue to the readiness gate below because the user explicitly requested a merge.

If the source branch cannot be updated, the conflict resolution is uncertain, or a replacement PR would be required, stop without merging and explain the next action needed.

4. Recheck Merge Readiness

After every review fix, conflict resolution, base-branch update, and other push is complete, refresh GitHub state and record the current head as the candidate head SHA. Wait for checks triggered by that exact commit to finish. Before merging, require all of the following for the candidate head:

  • the PR is open and not a draft;
  • GitHub reports it mergeable with no conflicts;
  • no actionable unresolved review threads or change requests remain;
  • all required reviews and required status checks have passed;
  • after the last head-changing push, the user has explicitly confirmed they tested the candidate head's relevant behavior;
  • branch protection does not report another unmet requirement.

Run any focused local check required by the two nested skills. Do not treat a local build as physical device testing, and do not waive a required check because a similar local command passed.

User confirmation is mandatory even when automated checks pass or the current request says to merge. If the user has not confirmed testing, prepare the PR as far as possible, leave it open, and ask them to test it. Never infer physical device testing from a build or compile result. Any later head-changing push, including another review fix or base-branch update, invalidates both the readiness result and the testing confirmation; repeat this step for the new candidate head.

If GitHub is still calculating mergeability, refresh briefly. If checks are pending, wait for them rather than enabling auto-merge. If any gate fails, leave the PR open and report the exact blocker with links where possible. Never use an administrator override or otherwise bypass branch protection.

5. Merge

Refresh the PR once more and compare its current head SHA with the candidate head recorded and validated in step 4. If they differ, do not merge; return to step 4 and validate the new head. Merge the identified PR using the repository's established merge method, preferring squash when no clear convention is available. Bind the merge to the unchanged candidate head SHA so it fails safely if another commit arrives. Prefer GitHub connector tools when available and pass their expected-head equivalent; otherwise use gh pr merge <number> --squash --match-head-commit <candidate-head-sha> (or the established method's equivalent).

Do not delete the source branch or close linked issues as part of this skill. After the command returns, refresh the PR. If GitHub placed it in a merge queue, monitor the queued PR at reasonable intervals until GitHub reports it merged or reports that it left the queue without merging. Do not treat queue admission as success, and do not stop merely because the PR remains open while queued. If it leaves the queue without merging, report the rejection or failed requirement and leave the PR open. Otherwise, verify that GitHub reports the PR as merged. A successful command or queue admission alone is not sufficient confirmation.

Final Update

Keep the result concise and include:

  • the PR number, title, and URL;
  • review feedback addressed or confirmation that none remained;
  • conflict/base-branch update performed;
  • final checks and review state;
  • the verified merge result, or the precise blocker if it stayed open.

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

Clean up completed Git branches and worktrees for this repository both locally and on GitHub. Use when the user asks to remove complete, completed, merged, stale, finished, or done branches, delete merged GitHub branches, tidy local worktrees, prune completed PR branches, or clean up branches and worktrees after pull requests have merged.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

Clean up local branch worktree folders for this repository after their branches or pull requests have merged to main. Use when the user asks to remove merged branch folders, tidy local worktrees, clean old feature branch directories, prune merged PR worktrees, or clean up local development folders without impacting main.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

compile

免费

Test compile ESPHome firmware for all devices using Docker and fix any YAML or configuration errors until every device compiles successfully. Use when the user says "/compile", "test compile", "compile check", "build test", "check builds", "verify compile", or wants to make sure all devices compile before committing.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

Review EspControl repository changes specifically for missing, stale, excessive, or misplaced documentation. Use when the user asks for a documentation coverage review, asks whether a feature or behavior change is concisely documented, invokes $docs-review, or explicitly wants docs checked as a secondary pass during a pull request, branch, or local diff review.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

Provide an expert codebase review for this repository. Use when the user says "Expert Review" or "/expert-review", asks for an expert review, wants refactoring or codebase improvement recommendations, wants consistency and quality assessed, or asks how to reduce duplication, improve component use, preserve the end-user experience, and keep upgrades cleanly migratable.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

Reimagine this repository from first principles using the current product and user experience as the target. Use when the user says "/expert-reset", asks how the project should be rebuilt if starting again, wants bold architecture or component-structure recommendations, or wants a research-only reset plan unconstrained by current implementation details.

中文简介正在准备中。当前显示原文说明。

jtenniswood/espcontrol11202026年10月26日 更新

查看 jtenniswood 的全部技能

报告此技能的问题