melvynx/merge
ai-coding/skills/merge/SKILL.md
Intelligently merge branches with context-aware conflict resolution
$ install --global
skillsauthnpx skillsauth add melvynx/aiblueprint mergeInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 4, 2026, 5:10 PM4.5s1 file scanned
SKILL.md
- 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>
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-currentto identify current branchgit statusto 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
- Search PR with
-
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 commitwith descriptive message - Conflicts: Parse
git diff --name-only --diff-filter=U
- Clean merge:
-
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 --cachedto review changes- Check no conflict markers remain:
grep -r "<<<<<<< HEAD" git add -Aand 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 --abortand report blockers
Related Skills
melvynx/skill-manager
development
VerifiedTrustedCommunity
Create or edit Claude, Codex, and Cursor skills/rules. Use for SKILL.md, .cursor/rules, AGENTS.md, skill prompts, frontmatter, references, scripts, and discovery rules.
196SKILL.mdUpdated May 26, 2026
melvynx/rules-manager
data-ai
VerifiedTrustedCommunity
Create and maintain agent rules in AGENTS.md and .agents/rules/. Use for project rules, conventions, constraints, rule indexes, or requests to add or optimize agent rules.
196SKILL.mdUpdated May 26, 2026
melvynx/environments-manager
development
VerifiedTrustedCommunity
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.
196SKILL.mdUpdated May 26, 2026
melvynx/grill-me
testing
VerifiedTrustedCommunity
Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when user wants to stress-test a plan, get grilled on their design, or mentions "grill me".
195SKILL.mdUpdated May 26, 2026