skills.rest
toroleapinc
toroleapincCOMMUNITY
Explore all skills by this author →
GitHub

brain-conflicts

Detect unresolved brain merge conflicts from brain-conflicts.json and apply resolutions.

78|18|Updated Mar 3, 2026
Search Tags:#synchronization#plugin#memory#merge#claude-code#brain#conflicts
One-click install
npx skills add https://github.com/toroleapinc/claude-brain --skill brain-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: brain-conflicts
Source: https://github.com/toroleapinc/claude-brain/tree/main/skills/brain-conflicts
Command: npx skills add https://github.com/toroleapinc/claude-brain --skill brain-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you identify and resolve unresolved brain merge conflicts that occur when Claude Brain data diverges across devices, ensuring a single, coherent memory, skills, and rules state.

Core Features & Use Cases

  • Detect unresolved conflicts by inspecting brain-conflicts.json and filter entries where resolved is not true.
  • Present per-conflict details (topic, Machine A vs Machine B, AI suggestion with confidence) and offer guided resolution options.
  • Apply chosen resolutions to the correct brain artifacts (CLAUDE.md, memory, etc.) and push changes to keep all machines in sync.

Quick Start

Resolve pending brain conflicts by following the guided prompts and then push your changes to finalize synchronization.

Frequently Asked Questions about brain-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve merge conflicts in Claude Brain across different machines?▼

To resolve merge conflicts across machines, the skill reads brain-conflicts.json, filters unresolved entries, and presents per-conflict resolution options fordiverging memories, rules, and CLAUDE.md files. You choose a resolution for each conflict, and the skill updates the brain files locally before requiring a final push via the plugin's push.sh script to synchronize all devices.

Why do my Claude Brain memory and rules diverge when collaborating across devices?▼

Brain memory and rules diverge across devices when cross-device collaboration introduces conflicting updates to CLAUDE.md or skills without immediate synchronization. This divergence creates unresolved entries in brain-conflicts.json that require conflict-aware reconciliation to restore a single coherent brain state.

How do I complete synchronization after resolving brain conflicts in Claude Code?▼

After resolving brain conflicts in Claude Code, you complete synchronization by running the CLAUDE plugin's push.sh script. This final push propagates the updated brain files, including CLAUDE.md and merged memories, to keep all connected machines in sync.

Does resolving brain conflicts manually overwrite the state from Machine A or Machine B?▼

Resolving brain conflicts does not blindly overwrite Machine A or Machine B. The skill displays details for both sides alongside an AI suggestion with confidence, allowing you to apply a specific chosen resolution to the correct brain artifacts rather than forcing an automatic overwrite.

Can I use this to merge CLAUDE.md files when cross-device synchronization fails?▼

Yes, you can use this to merge CLAUDE.md files when cross-device synchronization fails. It identifies the specific CLAUDE.md divergences logged in brain-conflicts.json and offers guided prompts to reconcile the differing rules and memory states across your machines.

Related Skills

Explore More Software Engineering Skills→
hamzaPixlhamzaPixl
2

hook-development

Validate and automate Claude Code plugin hook events with prompt and command hooks.

Community
Advanced
unclehowellunclehowell

2nd-brain

Store durable facts and synchronize memory across agent sessions.

Community
Advanced
toroleapinctoroleapinc
78

brain-init

Initialize a Git-backed brain repository and export Claude Code state to a remote.

Community
Advanced
JoNaYeonJoNaYeon
1

work_git_conflict-resolver

Analyze Git conflict markers and propose resolution plans for merge and rebase conflicts.

Community
Intermediate