Check whether this card's code meets the acceptance criteria
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新
免费在 GitHub 公开
git-pull
Pull remote changes and reconcile with local work, checking for soft conflicts
中文简介正在准备中。当前显示原文说明。
查看安装方法包含的文件（1）
- SKILL.md1.1 KB
SKILL.md（原文）
安装前可以查看交给 AI 代理的指令内容。
Your task: Pull remote changes
Pull the latest remote changes into the card's branch and reconcile them with local work.
- Run
git pullto fetch and integrate remote changes - If a hard conflict occurs, resolve it using the card's specs, description, and conversation history to make informed decisions
- Always check for soft conflicts — even if git merged cleanly, inspect the incoming changes against local specs and code for assumptions that have been invalidated by the remote changes. Use your judgement about what matters
- Report what changed. If soft conflicts exist, explain each one: what the local assumption was, what the remote change did, and how you resolved it (or ask the user if ambiguous)
- Apply straightforward resolutions directly. Ask the user about ambiguous ones.
When local changes are small, the soft-conflict check can be brief. When local changes are large, examine thoroughly.
评价
还没有评价。欢迎分享你的使用感受。
评论
无需登录即可发表。欢迎分享使用感受、提问，或说明在哪些环境下无法运行。
还没有评论。来写第一条吧。
同一仓库的技能
Summarise the unit and e2e tests a branch/PR adds, run only those, and produce a paste-ready report (e.g. for a Linear card). Use when asked to 'summarise added tests', 'run the new tests', 'what tests did this PR add', or to prove a card's test coverage.
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新
Run a quick UX/UI workshop using ASCII-art sketches
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新
Write automated tests for unticked scenarios in this card's test cases
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新
Review code changes on this card for likely bugs, regressions, and missed edges
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新
Maintain a support docs pack — dedup, length budgets, and no splintering — and land changes as a reviewed pull request. Use when a support thread, or a hand-off from Support assist, surfaces a new resolution, a correction to an existing one, or a deployment quirk worth recording. Not for ordinary code changes.
中文简介正在准备中。当前显示原文说明。
beyondessential/tamanu92026年10月19日 更新