This skill should be used when the user asks to "resolve crabtalk conflicts", "show sync conflicts", "fix crabtalk conflicts", "view config diffs", "crabtalk conflicts", or mentions merge conflicts from CrabTalk sync.
Display and resolve sync conflicts detected by CrabTalk between peer devices.
Check that ~/.claude/crabtalk.json exists. If it does not, inform the user to run /crabtalk:setup first and stop.
CrabTalk flags a conflict when the same file has been modified on two or more peers since their last successful sync. Conflicts are stored by the MCP server and retrievable via the list-conflicts tool.
Use the list-conflicts MCP tool to retrieve all unresolved conflicts. If a specific file path argument was provided, filter to that file only.
For each conflict, display:
~/.claude/If no conflicts exist, inform the user that everything is in sync.
For each conflict (or the user-specified file), read both versions and generate a unified diff:
diff -u <local_version> <remote_version>
Present the diff with clear labels indicating which device produced each version. Format as a fenced code block with diff syntax highlighting.
For each conflict, present three options:
Ask the user which option to take. Wait for their response before proceeding.
Based on the user's choice:
resolve-conflict MCP tool with resolution: "local"resolve-conflict MCP tool with resolution: "remote", then write the remote content to the local fileresolve-conflict with resolution: "manual" and the current file contentsAfter resolution, use list-conflicts again to confirm the conflict is cleared. Report remaining conflict count if any.
If multiple conflicts exist and the user wants to resolve them all at once with the same strategy (e.g., "keep all local"), iterate through each conflict applying the chosen resolution. Confirm the batch operation before executing.