Stats
Actions
Tags
From claude-brain-sync
Resolves pending brain merge conflicts across machines by presenting Machine A/B versions, AI suggestions, and user options for CLAUDE.md/memory files.
How this skill is triggered — by the user, by Claude, or both
Slash command
/claude-brain-sync:brain-conflictsThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
The user wants to resolve pending 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."
npx claudepluginhub toroleapinc/claude-brain --plugin claude-brain-syncAnalyzes git merge conflicts by type and context, proposes automated/manual resolutions, and validates fixes. Handles content, structural, semantic, and formatting issues.
Manually syncs Claude brain state across machines: checks initialization, pushes local changes, pulls and auto-merges remote updates, shows summary, suggests conflict resolution.
Guides through git merge conflicts one by one, parsing conflict markers, explaining why each conflict occurred via git history, and presenting resolution options with reasoning.