update

A workflow for bringing changes from an upstream Git branch into your current branch. It uses merging, which combines histories while preserving the record of both lines of work, and helps resolve conflicts.

In plain words
What is it for?
Use it to sync with the main branch or another upstream branch, incorporate recent changes, and resolve merge conflicts.
Why use it?
It helps update an out-of-date branch and work through conflicting edits from another branch.

Skill for Claude CodeCodex

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/technicalpickles/pickled-claude-plugins/update
Any agent
npx skills add technicalpickles/pickled-claude-plugins --skill update
Clone the repo
git clone --depth 1 https://github.com/technicalpickles/pickled-claude-plugins

Made for: Claude Code, Codex.

Per session 20 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,754 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00020 $0.01754
Opus 5 $0.00010 $0.00877
Sonnet 5 $0.00004 $0.00351
Haiku 4.5 $0.00002 $0.00175

Measured 2d ago against content hash 8d2a3d21eaad, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

update scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

plugins/git/skills/update/SKILL.md · 283 lines

How it starts

The opening of the file, as written. The whole thing — 283 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Git Update

Overview

Update your current branch with changes from the upstream branch, intelligently resolving conflicts when they occur.

Announce: "Using git:update to sync your branch with upstream..."

Philosophy:

  • Merge (not rebase) to preserve history
  • Understand intent behind conflicting changes
  • Resolve autonomously, present for approval before committing

When to Use

  • User says "update", "sync", "pull in latest", "merge main"
  • PR has conflicts that need resolving
  • Branch is behind upstream and needs updating
  • User wants to incorporate recent changes from main/master

Workflow: Detect Upstream

Step 1: Try tracking branch

git rev-parse --abbrev-ref @{upstream} 2>/dev/null

If this succeeds, use the result (e.g., origin/main).

Step 2: Fall back to PR base branch

If no tracking branch:

gh pr view --json baseRefName -q '.baseRefName' 2>/dev/null

If this succeeds, use origin/{result}.

Step 3: Ask user if neither works

If both fail, use AskUserQuestion:

I couldn't detect an upstream branch for this branch.

Which branch should I merge from?
(A) main
(B) master
(C) Other - I'll specify

Workflow: Fetch and Merge

Step 1: Fetch latest

git fetch origin

Step 2: Check if update needed

git rev-list --count HEAD..{upstream}

If count is 0, report "Already up to date with {upstream}" and stop.

Step 3: Attempt merge

git merge {upstream} --no-edit

Step 4: Branch on result

Exit Code Meaning Action
0 Clean merge Push and report success
1 Conflicts Proceed to conflict resolution

On clean merge:

git push

Report:

## Update Complete

Merged `{upstream}` into `{current-branch}`
{N} commits pulled in
Pushed to origin

Workflow: Conflict Resolution

Step 1: Inventory conflicts

git diff --name-only --diff-filter=U

Step 2: For each conflicted file, gather context

Read the full file on GitHub · 283 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2d ago First seen · 283 lines · 20 tokens per session scan A 8d2a3d21eaad

Subscribe to this mod's changes

update is a skill published in the GitHub repository technicalpickles/pickled-claude-plugins (10 stars, last pushed 5d ago), licensed MIT. It adds 20 tokens to every session and 1,754 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories