Skip to content
cccskills
FreePublished on GitHub

git-pull

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

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1.1 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Your task: Pull remote changes

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

  1. Run git pull to fetch and integrate remote changes
  2. If a hard conflict occurs, resolve it using the card's specs, description, and conversation history to make informed decisions
  3. 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
  4. 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)
  5. 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.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Check whether this card's code meets the acceptance criteria

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

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.

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

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

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

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

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

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

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

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.

The English summary is being prepared. Showing the original description.

beyondessential/tamanu9Updated Oct 20, 2026

See all skills by beyondessential

Report a problem with this skill