resolve-pr-conflicts

Compare original and translation side by side

🇺🇸

Original

English

🇨🇳

Translation

Chinese

Resolve PR conflicts

解决PR冲突

Update the PR's own branch against its current base. This skill does not authorize merging the PR or retargeting it to another base.

根据PR当前的base分支更新PR自身的分支。本技能不具备合并PR或将其重定向到其他base的权限。

Inspect and update

检查与更新

gh pr view <n> -R <owner/repo> --json state,headRefName,headRefOid,baseRefName,mergeable,isCrossRepository,maintainerCanModify

Confirm the PR is open and record its head SHA and base branch.
Work in a temporary worktree, preserving existing local edits.
Fetch the PR head and base from their actual repositories; record the base tip.
Confirm fork permissions and the destination remote before updating the PR branch.
Merge or rebase onto the fetched base according to the repository's guidance.

Get explicit approval before rewriting a branch you do not own, unless already authorized in the session. Disclose every rewrite. Use an explicit

--force-with-lease=<branch>:<recorded-head-sha>

for an authorized rewrite. If another contributor moved the PR head, stop and reconcile with its owner. Never push to the base branch.

gh pr view <n> -R <owner/repo> --json state,headRefName,headRefOid,baseRefName,mergeable,isCrossRepository,maintainerCanModify

确认PR处于开放状态，并记录其head SHA和base分支。
在临时worktree中操作，保留现有本地修改。
从对应仓库拉取PR的head和base；记录base的tip。
更新PR分支前，确认fork权限和目标remote。
根据仓库规范，执行Merge或rebase到已拉取的base上。

重写非你所有的分支前需获得明确批准，除非当前会话中已获得授权。所有重写操作都需告知。授权的重写操作需使用明确的

--force-with-lease=<branch>:<recorded-head-sha>

参数。若其他贡献者已移动PR head，需停止操作并与PR所有者协调。严禁推送到base分支。

Resolve and verify

解决与验证

Read the conflict guidance before resolving hunks. Preserve both changes' intent and check for semantic conflicts even when Git merges cleanly. Ask when the resolution requires a product decision.

Resolve the conflicts and complete the merge or rebase.
Run the repository's relevant build, format, lint, and tests on the combined tree.
Recheck the remote head and base before pushing.
Update and re-verify if the base moved; preserve concurrent head changes.
Push the verified update to the PR branch within the user's authorized scope.
Re-read the PR head and mergeability after the push.
Remove the temporary worktree after preserving the completed work.

Report the resolved conflicts, any rewrite, checks run, and remaining blockers. Return to the calling workflow for CI watching or an authorized merge.

解决hunks前请阅读冲突处理指南。需保留双方变更的意图，即使Git自动合并成功，也要检查是否存在语义冲突。若冲突解决需要产品决策，需提出询问。

解决冲突，完成Merge或rebase。
在合并后的代码树上运行仓库相关的build、format、lint和测试。
推送前重新检查remote的head和base。
若base有更新，需重新更新并验证；保留head上的并发变更。
在用户授权范围内，将验证通过的更新推送到PR分支。
推送后重新读取PR head和可合并状态。
保存完成的工作后，删除临时worktree。

报告已解决的冲突、所有重写操作、已运行的检查以及剩余的阻塞问题。返回调用工作流以进行CI监控或授权合并。