repo-cleanup-conflict-resolution-patterns
Acerca de
Esta habilidad proporciona patrones de resolución de conflictos y comandos para fusionar estructuras de repositorios, especialmente al consolidar bases de código. Ofrece estrategias específicas para manejar conflictos de nombres de archivos, contenido similar y archivos duplicados con comandos bash ejecutables. Los desarrolladores deben utilizarla durante operaciones de limpieza de repositorios para resolver conflictos de fusión sistemáticamente mientras preservan el contexto histórico.
Instalación rápida
Claude Code
Recomendadonpx skills add vamseeachanta/workspace-hub/plugin add https://github.com/vamseeachanta/workspace-hubgit clone https://github.com/vamseeachanta/workspace-hub.git ~/.claude/skills/repo-cleanup-conflict-resolution-patternsCopia y pega este comando en Claude Code para instalar esta habilidad
Documentación
Conflict Resolution Patterns (+2)
Conflict Resolution Patterns
| Conflict Type | Strategy | Example |
|---|---|---|
| Same filename | Rename with suffix | README.md -> README-legacy.md |
| Similar content | Use subdirectory | commands/ -> commands/legacy-scripts/ |
| Unique content | Preserve in dedicated folder | Keep implementation-history/ |
| Clear duplicates | Delete after verification | Remove exact copies |
Merge Commands
# Rename conflicting files before merge
mv .agent-os/README.md .agent-os/README-legacy.md
# Create legacy subdirectory for scripts
mkdir -p .claude/commands/legacy-scripts
git mv .agent-os/commands/* .claude/commands/legacy-scripts/
# Preserve unique historical content
git mv .agent-os/implementation-history/ .claude/docs/implementation-history/
# Find and remove exact duplicates (verify first)
md5sum .claude/agents/*.md .agent-os/agents/*.md | sort | uniq -w32 -d
Pre-Merge Checklist
- Compare file lists between source and target
- Identify naming conflicts
- Decide rename vs. subdirectory strategy
- Document unique content to preserve
- Verify duplicates before deletion
Repositorio GitHub
Habilidades relacionadas
algorithmic-art
MetaThis Claude Skill creates original algorithmic art using p5.js with seeded randomness and interactive parameters. It generates .md files for algorithmic philosophies, plus .html and .js files for interactive generative art implementations. Use it when developers need to create flow fields, particle systems, or other computational art while avoiding copyright issues.
subagent-driven-development
DesarrolloThis skill executes implementation plans by dispatching a fresh subagent for each independent task, with code review between tasks. It enables fast iteration while maintaining quality gates through this review process. Use it when working on mostly independent tasks within the same session to ensure continuous progress with built-in quality checks.
executing-plans
DiseñoUse the executing-plans skill when you have a complete implementation plan to execute in controlled batches with review checkpoints. It loads and critically reviews the plan, then executes tasks in small batches (default 3 tasks) while reporting progress between each batch for architect review. This ensures systematic implementation with built-in quality control checkpoints.
cost-optimization
OtroThis Claude Skill helps developers optimize cloud costs through resource rightsizing, tagging strategies, and spending analysis. It provides a framework for reducing cloud expenses and implementing cost governance across AWS, Azure, and GCP. Use it when you need to analyze infrastructure costs, right-size resources, or meet budget constraints.
