mirror of
https://github.com/davila7/claude-code-templates.git
synced 2026-09-19 01:30:23 +08:00
Dani
054c0e56e9
Removed the deprecated 'model: sonnet' field from command frontmatter to fix compatibility issues with Claude Code. Commands will now inherit the model from the active conversation instead of using a hardcoded deprecated model identifier. Changes: - Removed 'model: sonnet' from 142 command files across all categories - Commands now use default model inheritance behavior - Preserved 'model: claude-sonnet-4-5-20250929' in gemini-review.md (valid model) - 67 commands without model field remain unchanged This resolves the "model: sonnet not found" error reported in GitHub issues and aligns with Claude Code's recommended practice of letting commands inherit the conversation model. Affected categories: - Database/Supabase commands (8 files) - Documentation commands (8 files) - Deployment commands (11 files) - Setup commands (14 files) - Performance commands (8 files) - Team commands (14 files) - Security commands (6 files) - NextJS/Vercel commands (10 files) - Sync commands (14 files) - And more across other categories 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
36 lines
2.1 KiB
Markdown
36 lines
2.1 KiB
Markdown
---
|
|
allowed-tools: Read, Write, Edit, Bash
|
|
argument-hint: [action] | detect | resolve | analyze | configure | report
|
|
description: Resolve synchronization conflicts with intelligent strategies and automated resolution
|
|
---
|
|
|
|
# Sync Conflict Resolver
|
|
|
|
Resolve synchronization conflicts with intelligent automation: **$ARGUMENTS**
|
|
|
|
## Current Conflict State
|
|
|
|
- Sync database: @.sync-state.json or sync state files with potential conflicts
|
|
- Conflict history: !`find . -name "*conflict*" -o -name "*sync-errors*" | wc -l` conflict logs
|
|
- Resolution rules: @conflict-rules.json or existing resolution configuration
|
|
- Active conflicts: Current unresolved synchronization conflicts requiring attention
|
|
|
|
## Task
|
|
|
|
Implement comprehensive conflict resolution with intelligent automation:
|
|
|
|
**Resolution Action**: Use $ARGUMENTS to specify detect conflicts, resolve using strategies, analyze patterns, configure rules, or generate reports
|
|
|
|
**Conflict Resolution Framework**:
|
|
1. **Conflict Detection** - Scan synchronized items, compare field versions, identify timing conflicts, flag structural issues
|
|
2. **Intelligent Resolution** - Apply resolution strategies, handle field merging, preserve critical data, maintain relationships
|
|
3. **Pattern Analysis** - Study conflict trends, identify frequent issues, suggest process improvements, optimize strategies
|
|
4. **Configuration Management** - Set resolution preferences, define field priorities, configure merge rules, save automation settings
|
|
5. **Reporting & Analytics** - Generate conflict reports, track resolution success, analyze team patterns, provide insights
|
|
6. **Automated Prevention** - Implement locking mechanisms, optimize sync timing, enable change notifications, reduce conflicts
|
|
|
|
**Resolution Strategies**: Latest-wins, smart field-level merging, manual interactive resolution, system-priority resolution, custom rule-based resolution.
|
|
|
|
**Quality Assurance**: Backup before resolution, validation after changes, rollback capabilities, comprehensive audit trails.
|
|
|
|
**Output**: Resolved conflicts with detailed resolution reports, updated sync state, pattern analysis insights, and optimized conflict prevention strategies. |