with one click
brain-conflicts
Review and resolve unresolved brain merge conflicts.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Menu
Review and resolve unresolved brain merge conflicts.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Analyze accumulated brain memory and propose promotions to CLAUDE.md, rules, or new skills. Makes your brain smarter over time.
Initialize brain sync network. Creates a Git remote for your brain and exports your current Claude Code state.
Join an existing brain sync network from another machine. Pulls the consolidated brain and merges with any local state.
Show brain sync and evolution history.
Share a skill, agent, or rule with the team by copying it to the shared namespace
List all shared skills, agents, and rules in the brain network.
| name | brain-conflicts |
| description | Review and resolve unresolved brain merge conflicts. |
The user wants to resolve pending brain merge conflicts.
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:
Ask the user to choose:
After each resolution:
resolved: true with the chosen resolution in brain-conflicts.jsonAfter all conflicts are resolved:
bash "${CLAUDE_PLUGIN_ROOT}/scripts/push.sh"
Show summary: "X conflicts resolved. Brain is now fully synced."