MCP HubMCP Hub
Retour aux compétences

repo-cleanup-conflict-resolution-patterns

vamseeachanta
Mis à jour Today
11 vues
3
2
3
Voir sur GitHub
Autregeneral

À propos

Cette compétence fournit des modèles de résolution de conflits et des commandes pour fusionner des structures de dépôt, notamment lors de la consolidation de bases de code. Elle propose des stratégies spécifiques pour gérer les conflits de noms de fichiers, les contenus similaires et les fichiers duplicatifs avec des commandes bash actionnables. Les développeurs doivent l'utiliser lors des opérations de nettoyage de dépôt pour résoudre systématiquement les conflits de fusion tout en préservant le contexte historique.

Installation rapide

Claude Code

Recommandé
Principal
npx skills add vamseeachanta/workspace-hub
Commande PluginAlternatif
/plugin add https://github.com/vamseeachanta/workspace-hub
Git CloneAlternatif
git clone https://github.com/vamseeachanta/workspace-hub.git ~/.claude/skills/repo-cleanup-conflict-resolution-patterns

Copiez et collez cette commande dans Claude Code pour installer cette compétence

Documentation

Conflict Resolution Patterns (+2)

Conflict Resolution Patterns

Conflict TypeStrategyExample
Same filenameRename with suffixREADME.md -> README-legacy.md
Similar contentUse subdirectorycommands/ -> commands/legacy-scripts/
Unique contentPreserve in dedicated folderKeep implementation-history/
Clear duplicatesDelete after verificationRemove 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

Dépôt GitHub

vamseeachanta/workspace-hub
Chemin: .claude/skills/_internal/meta/repo-cleanup/conflict-resolution-patterns

Compétences associées

algorithmic-art

Méta

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

Voir la compétence

subagent-driven-development

Développement

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

Voir la compétence

executing-plans

Design

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

Voir la compétence

cost-optimization

Autre

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

Voir la compétence