brain-conflicts
starsforks
How to install brain-conflicts?
toroleapinc/claude-brain/brain-conflicts
$npx -y skills add toroleapinc/claude-brain --skill brain-conflictsReview and resolve unresolved brain merge conflicts.
SKILL.md
| 1 | The user wants to resolve pending brain merge conflicts. |
| 2 | |
| 3 | ## Steps |
| 4 | |
| 5 | 1. Read the conflicts file: |
| 6 | ```bash |
| 7 | cat ~/.claude/brain-conflicts.json 2>/dev/null || echo '{"conflicts":[]}' |
| 8 | ``` |
| 9 | |
| 10 | 2. Filter to unresolved conflicts (where `resolved` is not `true`). |
| 11 | |
| 12 | 3. If no unresolved conflicts, tell the user: "No pending conflicts. Brain is fully synced." |
| 13 | |
| 14 | 4. For each unresolved conflict, present: |
| 15 | - The topic |
| 16 | - What Machine A says |
| 17 | - What Machine B says |
| 18 | - The AI's suggestion and confidence level |
| 19 | |
| 20 | Ask the user to choose: |
| 21 | - **Accept AI suggestion**: Apply the suggestion |
| 22 | - **Keep Machine A's version**: Use A's content |
| 23 | - **Keep Machine B's version**: Use B's content |
| 24 | - **Keep both (machine-specific)**: Tag each with its machine name |
| 25 | - **Custom**: Let the user type their own resolution |
| 26 | |
| 27 | 5. After each resolution: |
| 28 | - Mark the conflict as `resolved: true` with the chosen resolution in brain-conflicts.json |
| 29 | - Apply the resolution to the appropriate brain file (CLAUDE.md, memory, etc.) |
| 30 | |
| 31 | 6. After all conflicts are resolved: |
| 32 | ```bash |
| 33 | bash "${CLAUDE_PLUGIN_ROOT}/scripts/push.sh" |
| 34 | ``` |
| 35 | |
| 36 | 7. Show summary: "X conflicts resolved. Brain is now fully synced." |
People who liked this also viewed
6 picksType
- lark-drive飞书云空间（云盘/云存储）：管理 Drive 文件和文件夹，包含上传/下载、创建文件夹、复制/移动/删除、查看元数据、评论/权限/订阅、标题、版本、飞书文档密级标签（secure labels）和本地文件导入。用户需要整理云盘目录、处理云空间资源 URL/token、判断链接类型/真实 token/标题，或导入 Word/Markdown/Excel/CSV/PPTX/.base 为 docx/sSkillsJul 2026
- lark-sharedUse for lark-cli setup/auth tasks: auth login/status/logout, user vs bot identity, business-domain permissions (--domain, including all/docs/drive), missing scopes, revoking authorization, or handlingSkillsJul 2026
- lark-whiteboard飞书画板：查询和编辑飞书云文档中的画板。支持导出画板为预览图片、导出原始节点结构、使用多种格式更新画板内容。 当用户需要查看画板内容、导出画板图片、编辑画板时使用此 skill。不负责：飞书云文档内容编辑（lark-doc）、文档内嵌电子表格/Base（lark-sheets / lark-base）。SkillsJul 2026
- lark-task飞书任务：管理任务、清单和任务智能体。创建待办任务、查看和更新任务状态、拆分子任务、组织任务清单、分配协作成员、上传任务附件、注册或注销任务智能体、更新任务智能体的主页数据、写入智能体任务记录。当用户需要创建待办事项、查看任务列表、跟踪任务进度、管理项目清单或给他人分配任务、为任务上传附件文件、注册注销任务智能体、更新智能体主页数据、写入任务记录时使用。SkillsJul 2026
- lark-attendance飞书考勤打卡：查询自己的考勤打卡记录SkillsJul 2026
- lark-apps妙搭（Spark/Miaoda）应用开发与托管：应用创建、本地全栈开发、云端生成迭代、创意设计（UI mockup / 可交互原型 / 线框图 / 落地页 / 仪表盘 / 幻灯片 deck / 视觉探索）、AI相关能力和飞书平台能力或者其他外部能力集成、日志/Trace/监控指标/PV/UV 查询、环境变量管理、应用角色与成员管理、自动化触发器（定时/记录变更/Webhook/飞书审批）。当用户要SkillsJul 2026
