Skill

brain-conflicts

Resolves pending brain merge conflicts in Claude Code by presenting Machine A/B versions, AI suggestions with confidence, and user options: accept AI, keep A/B, both, or custom.

Bash

cli-tools

npx claudepluginhub toroleapinc/claude-brain --plugin claude-brain-sync

Tool Access

This skill uses the workspace's default tool permissions.

Preview

The user wants to resolve pending brain merge conflicts.

SKILL.md

Similar Skills

conflict-resolver

Analyzes git merge conflicts by type and context, proposes automated/manual resolutions, and validates fixes. Handles content, structural, semantic, and formatting issues.

devkit

git-conflict-resolution

Resolves Git merge and rebase conflicts efficiently using bulk strategies like `git checkout --theirs/--ours` over manual conflict marker editing. Activates on merge/rebase conflicts.

idea-to-code

git-conflicts

Resolves Git merge and rebase conflicts file-by-file using modern tooling. Activates for conflicted merges, rebases, PRs unable to merge, or diverged branches. Supports --ours, --theirs, auto-push.

19 tools

git-plugin

Stats

Stars48

Forks13

Last CommitApr 17, 2026

Actions

View Source View Plugin View on GitHub View README

Help us improve

Share bugs, ideas, or general feedback.

The user wants to resolve pending brain merge conflicts.

Steps

Read the conflicts file:

cat ~/.claude/brain-conflicts.json 2>/dev/null || echo '{"conflicts":[]}'

Filter to unresolved conflicts (where resolved is not true).
If no unresolved conflicts, tell the user: "No pending conflicts. Brain is fully synced."
For each unresolved conflict, present:
- The topic
- What Machine A says
- What Machine B says
- The AI's suggestion and confidence level
Ask the user to choose:
- Accept AI suggestion: Apply the suggestion
- Keep Machine A's version: Use A's content
- Keep Machine B's version: Use B's content
- Keep both (machine-specific): Tag each with its machine name
- Custom: Let the user type their own resolution
After each resolution:
- Mark the conflict as resolved: true with the chosen resolution in brain-conflicts.json
- Apply the resolution to the appropriate brain file (CLAUDE.md, memory, etc.)

After all conflicts are resolved:

bash "${CLAUDE_PLUGIN_ROOT}/scripts/push.sh"

Show summary: "X conflicts resolved. Brain is now fully synced."