Agent skill

Pull

最新の origin/main を現在のローカルブランチに pull し、マージコンフリクトを解決する（別名 update-branch）。Codex が feature ブランチを origin と同期し、 rebase ではなく merge ベースの更新を行い、コンフリクト解決のベストプラクティスに従う必要があるときに使用する。

AGPL-3.0Auto-check passedDevelopment

Install Pull

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/pull .claude/skills/pull && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Paste into Claude Code

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .claude/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

$skill-installer

$skill-installer install https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull

Type this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a codex

Project install goes to .agents/skills/; add -g for ~/.codex/skills/.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull --agent codex

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/pull .agents/skills/pull && rm -rf skills-src

Use ~/.agents/skills/ instead of .agents/skills for a personal install.

Codex skills documentation · loads skills from .agents/skills/

Paste into Codex

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .agents/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a cursor

Project install goes to .agents/skills/; add -g for ~/.cursor/skills/.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull --agent cursor

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/pull .cursor/skills/pull && rm -rf skills-src

Use ~/.cursor/skills/ instead of .cursor/skills for a personal install.

Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/

Paste into Cursor

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .cursor/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

gemini skills install

$ gemini skills install https://github.com/team-mirai/mirai-gikai.git --path .agents/skills/pull

--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a gemini-cli

Project install goes to .agents/skills/; add -g for ~/.gemini/skills/.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull --agent gemini-cli

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/pull .gemini/skills/pull && rm -rf skills-src

Use ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.

Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/

Paste into Gemini CLI

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .gemini/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull

Installs for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a github-copilot

Project install goes to .agents/skills/; add -g for ~/.copilot/skills/.

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/pull .github/skills/pull && rm -rf skills-src

Use ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.

GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/

Paste into GitHub Copilot

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .github/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

skills CLI

$ npx skills add team-mirai/mirai-gikai --skill pull -a opencode

OpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.

GitHub CLI

$ gh skill install team-mirai/mirai-gikai pull --agent opencode

Project scope by default (.agents/skills/); add --scope user for a personal install.

Manual copy

$ git clone --depth 1 https://github.com/team-mirai/mirai-gikai.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/pull .opencode/skills/pull && rm -rf skills-src

Use ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.

OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/

Paste into OpenCode

Install the "pull" agent skill from https://github.com/team-mirai/mirai-gikai/tree/develop/.agents/skills/pull into .opencode/skills/pull/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "pull", then confirm the skill loads.

OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.

Facts

Skill name: pull
GitHub stars: 212
Token cost: ~690 tokens
SKILL.md length: 156 words
Files: 1
Skills in repo: 10
Repo updated: Oct 7, 2026
First seen: Oct 7, 2026
Licence: AGPL-3.0

At a glance

Works in 9 steps: git status… → ローカルで rerere が有効になっていることを確認する → リモートとブランチを確認する → …
Tasks that involve Git workflow
SKILL.md covers ワークフロー, コンフリクト解決ガイダンス（ベストプラクティス） and いつユーザーに確認するか（最小限に）
Calls git

What it does

Pull is an agent skill from team-mirai/mirai-gikai. 最新の origin/main を現在のローカルブランチに pull し、マージコンフリクトを解決する（別名 update-branch）。Codex が feature ブランチを origin と同期し、 rebase ではなく merge ベースの更新を行い、コンフリクト解決のベストプラクティスに従う必要があるときに使用する。

Its SKILL.md is about 690 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The licence is AGPL-3.0.

When your agent uses it

Tasks that involve Git workflow

Example prompts

“/pull”

Workflow steps

9 steps, taken from the first numbered list in SKILL.md.

git status がクリーンであることを確認するか、マージ前に変更をコミット／stash する。
ローカルで rerere が有効になっていることを確認する
リモートとブランチを確認する
最新の ref を fetch する
まずリモートの feature ブランチを同期する
順番にマージする
コンフリクトが現れたら解決し（下記のコンフリクトガイダンスを参照）、その後
プロジェクトのチェックで検証する（AGENTS.md のリポジトリポリシーに従う）。
マージをサマリする

What it can do on your machine

Read from SKILL.md and the folder at commit 00b649b. It shows what the files ask for, not the result of running them.

Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
- git
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Pull loads about 690 tokens when it runs. Until then it costs about 44 tokens; SKILL.md has 156 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it: ~44
When it runs · the whole SKILL.md, loaded when a task matches: ~690

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from team-mirai/mirai-gikai at commit 00b649b, republished under its AGPL-3.0 licence (© team-mirai). 156 words, ~690 tokens.

Download SKILL.mdSave it as .claude/skills/pull/SKILL.md (or your agent's skills folder).

name: pull
description: 最新の origin/main を現在のローカルブランチに pull し、マージコンフリクトを解決する（別名 update-branch）。Codex が feature ブランチを origin と同期し、 rebase ではなく merge ベースの更新を行い、コンフリクト解決のベストプラクティスに従う必要があるときに使用する。

Pull

ワークフロー

git status がクリーンであることを確認するか、マージ前に変更をコミット／stash する。
ローカルで rerere が有効になっていることを確認する:
- git config rerere.enabled true
- git config rerere.autoupdate true
リモートとブランチを確認する:
- origin リモートが存在することを確認する。
- 現在のブランチがマージを受け取るブランチであることを確認する。
最新の ref を fetch する:
- git fetch origin
まずリモートの feature ブランチを同期する:
- git pull --ff-only origin $(git branch --show-current)
- これは origin/main をマージする前に、リモートで行われたブランチ更新（例: GitHub の自動コミット）を取り込む。
順番にマージする:
- より明確なコンフリクトコンテキストを得るため git -c merge.conflictstyle=zdiff3 merge origin/main を優先する。
コンフリクトが現れたら解決し（下記のコンフリクトガイダンスを参照）、その後:
- git add <files>
- git commit（マージが一時停止している場合は git merge --continue）
プロジェクトのチェックで検証する（AGENTS.md のリポジトリポリシーに従う）。
マージをサマリする:
- 最も困難だったコンフリクト／ファイルとそれをどう解決したかを伝える。
- 仮定やフォローアップを記録する。

コンフリクト解決ガイダンス（ベストプラクティス）

編集前にコンテキストを検査する:
- git status でコンフリクトしたファイルを一覧表示する。
- git diff または git diff --merge でコンフリクトハンクを見る。
- ファイルレベルの意図を見るため、git diff :1:path/to/file :2:path/to/file と git diff :1:path/to/file :3:path/to/file で base と ours/theirs を比較する。
- merge.conflictstyle=zdiff3 ではコンフリクトマーカーに以下が含まれる:
  - <<<<<<< ours、||||||| base、======= 区切り、>>>>>>> theirs。
  - 開始／終了付近の一致行はコンフリクト領域から除去されるため、異なるコア部分に集中する。
- 両側の変更の意図をサマリし、意味的に正しい結果を決定してから編集する:
  - 各側が達成しようとしていること（バグ修正、リファクタ、リネーム、挙動変更）を述べる。
  - 共有のゴールがあるか、一方が他方を上書きするかを特定する。
  - まず最終的な挙動を決定し、その後その決定に合わせてコードを作る。
  - コンフリクトが意図的な変更を明確に示していない限り、不変条件、API 契約、ユーザー可視の挙動の保持を優先する。
- 解決方法を選ぶ前に、ファイルを開いて両側の意図を理解する。
最小で意図を保つ編集を優先する:
- ブランチの目的と挙動を整合させる。
- 偶発的な削除や暗黙の挙動変更を避ける。
一度に 1 ファイルずつ解決し、論理的なバッチごとにテストを再実行する。
一方が完全に勝つべきと確信できる場合のみ ours/theirs を使う。
複雑なコンフリクトでは、コードベースの他の部分と整合させるために関連ファイルや定義を検索する。
生成ファイルの場合、まず非生成のコンフリクトを解決し、その後再生成する:
- 生成された成果物に触れる前に、ソースファイルと手書きロジックの解決を優先する。
- 生成ファイルを生成した CLI／ツールコマンドを実行してきれいに作り直し、再生成された出力をステージする。
意図が不明確な import コンフリクトの場合、まず両側を受け入れる:
- すべての候補 import を一時的に保持し、マージを完了し、その後 lint／type チェックを実行して未使用や不正な import を安全に削除する。
解決後、コンフリクトマーカーが残っていないことを確認する:
- git diff --check
不確かなときは仮定を記録し、マージを最終化する前に確認を求める。

いつユーザーに確認するか（最小限に）

安全で可逆的な代替手段がない場合を除き、入力を求めない。ベストエフォートで決定し、根拠を記録して進めることを優先する。

ユーザーに確認するのは以下の場合のみ:

正しい解決が、コード・テスト・近接するドキュメントから推論できないプロダクト意図や挙動に依存する場合。
コンフリクトがユーザー可視の契約、API サーフェス、またはマイグレーションをまたぐ場合で、誤った選択が外部消費者を壊す可能性がある場合。
コンフリクトが、技術的な利点が同等で明確なローカルシグナルがない、相互排他的な 2 つのデザインの選択を要求する場合。
マージがデータ損失、スキーマ変更、または明らかな安全なデフォルトのない不可逆な副作用を導入する場合。
ブランチが意図したターゲットでない、またはリモート／ブランチ名が存在せずローカルで決定できない場合。

それ以外の場合は、マージを進め、ノートで決定を簡潔に説明し、明確でレビュー可能なコミット履歴を残す。

Files

Just SKILL.md in .agents/skills/pull of team-mirai/mirai-gikai.

Open the folder on GitHubat commit 00b649b

Compare with similar skills

Pull next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Pull compared with similar skills
Skill	Stars	Used in	Tokens	Auto-check	Licence	Repo updated
Pull this skillteam-mirai/mirai-gikai	212	—	~690	Automated safety check: Pass	AGPL-3.0	yesterday
Finishing a Development Branchobra/superpowers	296k	5 repos	~1.9k	Automated safety check: Pass	MIT	today
Code Design Rationale Investigatorcursor/plugins	10k	9 repos	~2.6k	Automated safety check: Pass	None	today
Contributor-First PR MergeHKUDS/OpenHarness	16k	1 repos	~847	Automated safety check: Pass	MIT	4 mo ago
Migrate Internal Package into GhostTryGhost/Ghost	55k	—	~3.8k	Automated safety check: Pass	MIT	today
Create Pull Requestcline/cline	70k	1 repos	~1.6k	Automated safety check: Pass	Apache-2.0	today

Similar skills

Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
296k GitHub starsUsed in 5 repos~1.9k tokens
DevelopmentAuto-check passed
Code Design Rationale Investigator
cursor/plugins
Official
Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.
10k GitHub starsUsed in 9 repos~2.6k tokens
DevelopmentAuto-check passed
Contributor-First PR Merge
HKUDS/OpenHarness
Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.
16k GitHub starsUsed in 1 repo~847 tokens
DevelopmentAuto-check passed
Migrate Internal Package into Ghost
TryGhost/Ghost
Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.
55k GitHub stars~3.8k tokensUpdated today
DevelopmentAuto-check passed
Create Pull Request
cline/cline
Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.
70k GitHub starsUsed in 1 repo~1.6k tokens
DevelopmentAuto-check passed
Git Merge Conflict Resolver
tailcallhq/forgecode
Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.
7.6k GitHub starsUsed in 1 repo~4.5k tokens
DevelopmentAuto-check passed

Questions about Pull

What does Pull do?

When should I use Pull?

Pull fits situations like: tasks that involve Git workflow.

How do I install Pull in Claude Code?

Run `npx skills add team-mirai/mirai-gikai --skill pull -a claude-code`. Or copy the skill folder (.agents/skills/pull in team-mirai/mirai-gikai) into .claude/skills/pull in your project. Claude Code loads it when a task matches its description.

How do I install Pull in Codex?

Run `npx skills add team-mirai/mirai-gikai --skill pull -a codex`. Or copy the skill folder (.agents/skills/pull in team-mirai/mirai-gikai) into .agents/skills/pull in your project. Codex loads it when a task matches its description.

Can I use Pull in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add team-mirai/mirai-gikai --skill pull -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/pull, .gemini/skills/pull, .github/skills/pull and .opencode/skills/pull in your project.

What does Pull need to run?

Going by SKILL.md and its folder, Pull needs the command-line tools its instructions call (git).

Does Pull access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Pull safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Pull use?

Pull is published under the AGPL-3.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Pull use?

About 690 tokens (SKILL.md is roughly 2.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Pull?

Skills that share tags, products or a category with Pull: Finishing a Development Branch (obra/superpowers, 296k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Pull?

team-mirai (a GitHub organization) maintains it in team-mirai/mirai-gikai, which has 212 GitHub stars. The repository holds 10 skills in this directory. The repository was last updated on October 7, 2026.

Source: team-mirai/mirai-gikai on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.

Pull

Install Pull

Facts

At a glance

What it does

When your agent uses it

Example prompts

Workflow steps

What it can do on your machine

Tool permissions

Runs code

Network

Credentials

Context cost

Safety

SKILL.md

Pull

ワークフロー

コンフリクト解決ガイダンス（ベストプラクティス）

いつユーザーに確認するか（最小限に）

Files

Compare with similar skills

Similar skills

Finishing a Development Branch

Code Design Rationale Investigator

Contributor-First PR Merge

Migrate Internal Package into Ghost

Create Pull Request

Git Merge Conflict Resolver

More from team-mirai/mirai-gikai

Agent Browser

Land

Linear

Linear

Parallel PR

PR Screenshot

Questions about Pull

Install Pull

Facts

At a glance

What it does

When your agent uses it

Example prompts

Workflow steps

What it can do on your machine

Tool permissions

Runs code

Network

Credentials

Context cost

Safety

SKILL.md

Pull

ワークフロー

コンフリクト解決ガイダンス（ベストプラクティス）

いつユーザーに確認するか（最小限に）

Files

Compare with similar skills

Similar skills

More from team-mirai/mirai-gikai

Related

Questions about Pull