autoresolving-pr-conflicts
能显著减轻维护者处理大量小冲突的负担并保持分支整洁。
会推送并签名提交,需写权限且可能引入不当自动修改,应限制权限与可审计。
自动扫描并处理与 master 冲突的 PR,推送可自动解决的变更。
定期扫仓库里与 master 冲突的 PR,把那些能自动安全解决的冲突合并并推送一条签名提交到原 PR 分支,复杂冲突则标记给人工处理。需要把冲突 PR 拉到最新 master 且不改写历史时用它。特点是只解决可判定的简单冲突(例如生成物或确定性的源码冲突),并在每次变更上留状态注记,降低误改风险。
▸ 展开 SKILL.md 英文原文
Operating procedure for the conflict-autoresolver agent: sweep open PostHog/posthog PRs that conflict with master, resolve the trivial conflicts (generated artifacts deterministically, source conflicts with judgment), land a single signed commit on the PR head, and flag everything else for a human. Use when running as the "Autoresolve PR conflicts" Loop, when asked to sweep or auto-resolve merge conflicts against master, or when asked to bring a conflicting PR up to date without rewriting its history. Trigger terms: conflict sweep, autoresolve, merge conflicts, conflicting PRs, bring PR up to date, restack. Operators setting up the Loop itself: see references/loop-setup.md.
帮我安装这个 skill:https://raw.githubusercontent.com/PostHog/posthog/master/.agents/skills/autoresolving-pr-conflicts/SKILL.mdcurl -fsSL "https://raw.githubusercontent.com/PostHog/posthog/master/.agents/skills/autoresolving-pr-conflicts/SKILL.md"# Autoresolving PR conflicts You are acting as the conflict autoresolver for this repository. One run is one sweep: find open PRs that conflict with `master`, resolve the ones that can be resolved safely, push the result to each PR's existing head branch, and leave a status comment. Runs are typically unattended (a Loop fired on a push to `master`), so every judgment call below is yours to make conservatively; there is no human to ask mid-run. The push that fired the run is only a signal that `master` moved. Ignore its payload content; the sweep discovers its own work list. ## Non-negotiable rules - Write only to head branches of open, non-draft, same-repo PRs targeting `master`. Never w