PHPCraftdream

Merge Intel — Git skill for Claude Code

Git community

Pull upstream/main into the fork with intent-driven conflict resolution.

How to install Merge Intel

Installs to ~/.claude/commands/phpcraftdream-rush-merge-intel.md

Terminal

mkdir -p ~/.claude/commands && curl -fsSL https://raw.githubusercontent.com/PHPCraftdream/rush/HEAD/.claude/commands/merge-intel.md -o ~/.claude/commands/phpcraftdream-rush-merge-intel.md

Restart Claude Code, or start a new session, for it to be picked up.

What Merge Intel does

description: Pull upstream/main into the fork with intent-driven conflict resolution.

/merge-intel — intent-driven upstream merge

You are about to merge `origin/main` into the current fork branch. The goal is **not** "make conflicts go away" — it is to understand the upstream author's intent at each conflict, weigh it against what this fork actually needs, and record the decision so the next merge is faster.

Read this whole file before doing anything. It is a playbook, not just a li

Alternatives in Git

Ws Reset — Reset the current branch to main, fetch upstream, and update submodules 38.1k ★
Intel — On-demand intelligence fetch for a target — CVEs, disclosed reports, new features 3.8k ★
TDD Guard — by Nizar Selander - A hooks-driven system that monitors file operations in real-time and blocks changes that v 1.9k ★