Slash Command

/sync-conflicts

Lists sync conflict files from claude-sync operations and resolves them interactively, via batch keep local/remote, or manually with diffs.

git-workflow

npx claudepluginhub tawanorg/claude-sync --plugin claude-sync

Prompt Preview

# 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...

Command Content

Stats

Parent Repo Stars44

Parent Repo Forks10

Last CommitFeb 8, 2026

Actions

View Source View Plugin View on GitHub View README

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:

test -f ~/.claude-sync/config.yaml && echo "configured" || echo "not configured"

If not configured, tell the user to run /sync-init first.

List Conflicts

Show all conflict files:

claude-sync conflicts --list

Interactive Resolution

For interactive resolution, ask the user how they want to proceed:

Resolve one at a time - Guide through each conflict interactively
Keep all local - Run claude-sync conflicts --keep local
Keep all remote - Run claude-sync conflicts --keep remote

Batch Resolution

Keep all local versions:

claude-sync conflicts --keep local

Keep all remote versions:

claude-sync conflicts --keep remote

Manual Resolution

For complex conflicts, you can:

Read both files to compare:
- Local file: the original path
- Conflict file: {path}.conflict.{timestamp}
Show diff between them
Let user choose which to keep or merge manually

Report Results

After resolution:

Report how many conflicts were resolved
Note any that were skipped
Remind about /sync-push if they made changes