pull

Pull latest origin/main into the current local branch and resolve merge conflicts (aka update-branch). Use when Codex needs to sync a feature branch with origin, perform a merge-based update, and resolve conflicts safely.

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/sushaantu/boxento/pull
Any agent
npx skills add sushaantu/boxento --skill pull
Clone the repo
git clone --depth 1 https://github.com/sushaantu/boxento

Made for: Claude Code, Codex.

Per session 45 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 389 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin unknown 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.00045 $0.00389
Opus 5 $0.00023 $0.00195
Sonnet 5 $0.00009 $0.00078
Haiku 4.5 $0.00005 $0.00039

Measured today against content hash 7a844b08443b, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

pull 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 today.

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.

.codex/skills/pull/SKILL.md · 43 lines

What it actually says

Pull

Workflow

  1. Verify the git status is clean or commit/stash changes before merging.
  2. Ensure rerere is enabled locally:
    • git config rerere.enabled true
    • git config rerere.autoupdate true
  3. Confirm remotes and branches:
    • Ensure the origin remote exists.
    • Ensure the current branch is the one to receive the merge.
  4. Fetch latest refs:
    • git fetch origin
  5. Sync the remote feature branch first:
    • git pull --ff-only origin $(git branch --show-current)
  6. Merge origin/main:
    • Prefer git -c merge.conflictstyle=zdiff3 merge origin/main
  7. If conflicts appear, resolve them, then stage the resolved files and complete the merge.
  8. Verify with project checks appropriate to the scope.
  9. Summarize the merge, including the main conflicts and how they were resolved.

Conflict guidance

  • Inspect context before editing with git status, git diff, and file-level diffs.
  • Decide the final behavior before editing conflict markers.
  • Prefer minimal, intention-preserving edits.
  • Resolve one file at a time and rerun checks after each logical batch.
  • For generated files, resolve source conflicts first and regenerate if needed.
  • After resolving, ensure no conflict markers remain with git diff --check.

Ask the user only when necessary

Ask only when the correct resolution depends on product intent that is not inferable from code, tests, or nearby documentation, or when the conflict would introduce irreversible risk without an obvious safe default.

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. today First seen · 43 lines · 45 tokens per session scan A 7a844b08443b

Subscribe to this mod's changes

pull is a skill published in the GitHub repository sushaantu/boxento (153 stars, last pushed 20d ago), licensed MIT. It adds 45 tokens to every session and 389 once invoked, about $0.0002 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-09-01.

Related

Other skills, from other repositories

flutter

Flutter 3.44 — widget catalog, layouts, interactivity, animations, navigation, assets, adaptive/responsive design, accessibility, i18n, state management, data & backend (networking, serialization, Firebase, persistence), app architecture (MVVM, DI), platform integration (Android, iOS, web, Windows, macOS, Linux…

pledgeandgrow/pledge-skills · 126 tokens

using-xtool

This skill should be used when building iOS apps with xtool (Xcode-free iOS development), creating xtool projects, adding app extensions, or configuring xtool.yml. Triggers on "xtool", "SwiftPM iOS", "iOS on Linux", "iOS on Windows", "Xcode-free", "app extension", "widget extension", "share extension". Covers project…

2389-research/xtool · 93 tokens

flutter-review

Flutter & Dart Code Review: Expert review of Flutter applications focusing on widget architecture, state management, Dart best practices, performance, and platform-specific considerations. Use whenever the user wants a review of Flutter/Dart code, widget design, state management patterns, or mentions Flutter, Dart…

camilooscargbaptista/cto-toolkit · 99 tokens

cn-web-search

中文网页搜索 - 聚合 17 个免费搜索引擎,无需 API Key,纯网页抓取,支持公众号/财经/技术/学术/知识搜索。.

joansongjr/cn-web-search · 41 tokens

systematic-debugging

Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.

obra/superpowers · 21 tokens

next-cache-components-adoption

Turn on Cache Components in a Next.js app and resolve the blocking routes it surfaces. Use when the user wants to enable, adopt, or migrate to Cache Components, flip the cacheComponents flag, work through a flood of blocking-prerender / instant validation errors, run the cache-components-instant-false codemod, or…

vercel/next.js · 95 tokens