Stats
Actions
Tags
Help us improve
Share bugs, ideas, or general feedback.
From claude-sync
Lists sync conflict files from claude-sync operations and resolves them interactively, via batch keep local/remote, or manually with diffs.
npx claudepluginhub tawanorg/claude-sync --plugin claude-syncHow this command is triggered — by the user, by Claude, or both
Slash command
/claude-sync:sync-conflictsThe summary Claude sees in its command listing — used to decide when to auto-load this command
# Sync Conflicts Find and resolve conflicts from sync operations. When both local and remote files change, the remote version is saved as a `.conflict` file. ## Check Configuration First verify claude-sync is configured: If not configured, tell the user to run `/sync-init` first. ## List Conflicts Show all conflict files: ## Interactive Resolution For interactive resolution, ask the user how they want to proceed: 1. **Resolve one at a time** - Guide through each conflict interactively 2. **Keep all local** - Run `claude-sync conflicts --keep local` 3. **Keep all remote** - Run `c...
/sync-conflict-resolverDetects, resolves, analyzes, configures, and reports synchronization conflicts between GitHub and Linear projects using strategies like latest-wins, merge, or interactive mode.
/syncSyncs Nemp memories bidirectionally with CLAUDE.md: imports user context, detects conflicts with project state, exports updates. Supports --import-only, --export-only, --check modes.
/fix-conflictsFixes all git merge conflicts in the working tree using three-way resolution, commits the result, continues operations if needed, and pushes to remote.
Share bugs, ideas, or general feedback.
Find and resolve conflicts from sync operations. When both local and remote files change, the remote version is saved as a .conflict file.
First verify claude-sync is configured:
test -f ~/.claude-sync/config.yaml && echo "configured" || echo "not configured"
If not configured, tell the user to run /sync-init first.
Show all conflict files:
claude-sync conflicts --list
For interactive resolution, ask the user how they want to proceed:
claude-sync conflicts --keep localclaude-sync conflicts --keep remoteKeep all local versions:
claude-sync conflicts --keep local
Keep all remote versions:
claude-sync conflicts --keep remote
For complex conflicts, you can:
{path}.conflict.{timestamp}After resolution:
/sync-push if they made changes