name	merge
description	Intelligently merge branches with context-aware conflict resolution
allowed-tools	Bash(git :), Bash(gh :), Read, Edit, MultiEdit, Task
argument-hint	<branch-name>
disable-model-invocation	true
allow_implicit_invocation	false

Merge

Merge branches intelligently by understanding feature context and resolving conflicts efficiently.

Context

Current branch: !git branch --show-current
Working tree status: !git status --short
Target branch: $1
Recent commits: !git log --oneline -5

Workflow

CONTEXT GATHERING:
- git branch --show-current to identify current branch
- git status to ensure clean working tree
- CRITICAL: Abort if uncommitted changes exist
FEATURE ANALYSIS:
- Search PR with gh pr list --head <branch-name>
- Get PR details with gh pr view <number> --json title,body,files
- Use Task agents to gather context from PR/issue descriptions
MERGE ATTEMPT:
- git fetch origin <branch-name>
- git merge origin/<branch-name> --no-commit
- Check status with git status --porcelain
CONFLICT DETECTION:
- Clean merge: git commit with descriptive message
- Conflicts: Parse git diff --name-only --diff-filter=U
SMART RESOLUTION: For each conflicted file:
- Read file to understand conflict markers
- Apply resolution based on context:
  - Feature additions: Keep both if non-overlapping
  - Bug fixes: Prefer incoming if fixing known issue
  - Refactors: Analyze intent and merge carefully
- Use MultiEdit to resolve all conflicts
- STOP: If >10 files conflicted, ask user
VERIFICATION:
- git diff --cached to review changes
- Check no conflict markers remain: grep -r "<<<<<<< HEAD"
- git add -A and commit

Conflict Resolution by Type

package.json: Merge dependencies, prefer higher versions
Config files: Combine settings unless mutually exclusive
Source code: Use PR/issue context to understand intent
Tests: Keep all tests unless duplicates
Imports: Merge all, deduplicate

Rules

ALWAYS gather context before merging
NEVER blindly accept theirs/ours without analysis
ABORT if conflicts exceed 10 files
Max 3 resolution attempts per file
If stuck: git merge --abort and report blockers

Más de este repositorio

mismo repositorio

use-artifacts

Melvynx/aiblueprint

Create Claude-style local HTML artifacts under global ~/.agents/artifacts. Use for artifact requests, variations/options croquis, feature plans, thinking docs, prototypes, visualizations, dashboards, diagrams, or substantial reusable content. Pair with use-style.

2026-07-14221

use-style

Melvynx/aiblueprint

Apply named visual style guides to landing pages, app shells, and UI. Use for $use-style, /useskill, list styles, or styles like ios-app, grid, vercel, black-grid, stripe, linear, raycast, gumroad, dusk, or luma.

2026-07-14221

agents-manager

Melvynx/aiblueprint

Expert guidance for creating, building, and using Claude Code agents and the Task tool. Use when working with agents, setting up agent configurations, understanding how agents work, or using the Task tool to launch specialized agents.

2026-07-03221

apex

Melvynx/aiblueprint

Systematic implementation using APEX methodology (Analyze-Plan-Execute-eXamine) with parallel agents, self-validation, and optional adversarial review. Use when implementing features, fixing bugs, or making code changes that benefit from structured workflow.

2026-07-03221

appstore-connect

Melvynx/aiblueprint

Interact with App Store Connect via the asc CLI - apps, builds, TestFlight, beta testers, reviews, sales/analytics, metadata, IAP, signing, submissions. Use for "check my app", "App Store Connect", "TestFlight status", "app review", "my app sales", or "asc".

2026-07-03221

environments-manager

Melvynx/aiblueprint

Set up per-worktree environments for Claude Code, Cursor, or Codex. Use for worktree-ready repos, IDE environment config, worktree-up/down scripts, or dev.sh wiring.

2026-07-03221

Merge

Merge branches intelligently by understanding feature context and resolving conflicts efficiently.

Context

Current branch: !git branch --show-current

Working tree status: !git status --short

Target branch: $1

Recent commits: !git log --oneline -5

Workflow

CONTEXT GATHERING:

git branch --show-current to identify current branch
git status to ensure clean working tree
CRITICAL: Abort if uncommitted changes exist

FEATURE ANALYSIS:

Search PR with gh pr list --head <branch-name>
Get PR details with gh pr view <number> --json title,body,files
Use Task agents to gather context from PR/issue descriptions

MERGE ATTEMPT:

git fetch origin <branch-name>
git merge origin/<branch-name> --no-commit
Check status with git status --porcelain

CONFLICT DETECTION:

Clean merge: git commit with descriptive message
Conflicts: Parse git diff --name-only --diff-filter=U

SMART RESOLUTION: For each conflicted file:

Read file to understand conflict markers
Apply resolution based on context:
- Feature additions: Keep both if non-overlapping
- Bug fixes: Prefer incoming if fixing known issue
- Refactors: Analyze intent and merge carefully
Use MultiEdit to resolve all conflicts
STOP: If >10 files conflicted, ask user

VERIFICATION:

git diff --cached to review changes
Check no conflict markers remain: grep -r "<<<<<<< HEAD"
git add -A and commit

Conflict Resolution by Type

package.json: Merge dependencies, prefer higher versions

Config files: Combine settings unless mutually exclusive

Source code: Use PR/issue context to understand intent

Tests: Keep all tests unless duplicates

Imports: Merge all, deduplicate

Rules

ALWAYS gather context before merging

NEVER blindly accept theirs/ours without analysis

ABORT if conflicts exceed 10 files

Max 3 resolution attempts per file

If stuck: git merge --abort and report blockers