git-pull

Stars1

Forks0

UpdatedJuly 23, 2026 at 05:57

Pull remote changes and reconcile with local work, checking for soft conflicts

Installation

Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.

Source

beyondessential

beyondessential/canopy

View GitHub Repository View Creator Repositories

Download

Related occupationsSOC

Based on SOC occupation classification

Software DevelopersComputer and Mathematical Occupations·SOC 15-1252

SKILL.md

readonly

name	git-pull
description	Pull remote changes and reconcile with local work, checking for soft conflicts
label	Pull
workhorse-version	0.2.0

Your task: Pull remote changes

Pull the latest remote changes into the card's branch and reconcile them with local work.

Run git pull to 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.

More from this repository

same repository

acceptance-audit

beyondessential/canopy

Check whether this card's code meets the acceptance criteria

2026-07-231

ascii-design

beyondessential/canopy

Run a quick UX/UI workshop using ASCII-art sketches

2026-07-231

automate-test-cases

beyondessential/canopy

Write automated tests for unticked scenarios in this card's test cases

2026-07-231

bug-review

beyondessential/canopy

Review code changes on this card for likely bugs, regressions, and missed edges

2026-07-231

cherry-pick-changes

beyondessential/canopy

Cherry-pick post-merge commits onto a new follow-up branch

2026-07-231

curate-support-docs

beyondessential/canopy

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.

2026-07-231

name	git-pull
description	Pull remote changes and reconcile with local work, checking for soft conflicts
label	Pull
workhorse-version	0.2.0

Your task: Pull remote changes

Pull the latest remote changes into the card's branch and reconcile them with local work.

Run git pull to 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.