MCP HubMCP Hub
Zurück zu Fähigkeiten

repo-cleanup-conflict-resolution-patterns

vamseeachanta
Aktualisiert 2 days ago
10 Ansichten
3
2
3
Auf GitHub ansehen
Anderegeneral

Über

Diese Fähigkeit bietet Konfliktlösungsmuster und Befehle zum Zusammenführen von Repository-Strukturen, insbesondere bei der Konsolidierung von Codebasen. Sie stellt spezifische Strategien zur Behandlung von Dateinamenkonflikten, ähnlichen Inhalten und doppelten Dateien mit umsetzbaren Bash-Befehlen bereit. Entwickler sollten sie während Bereinigungsvorgängen von Repositories verwenden, um Merge-Konflikte systematisch zu lösen und gleichzeitig den historischen Kontext zu bewahren.

Schnellinstallation

Claude Code

Empfohlen
Primär
npx skills add vamseeachanta/workspace-hub
Plugin-BefehlAlternativ
/plugin add https://github.com/vamseeachanta/workspace-hub
Git CloneAlternativ
git clone https://github.com/vamseeachanta/workspace-hub.git ~/.claude/skills/repo-cleanup-conflict-resolution-patterns

Kopieren Sie diesen Befehl und fügen Sie ihn in Claude Code ein, um diese Fähigkeit zu installieren

Dokumentation

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

GitHub Repository

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

Verwandte Skills

algorithmic-art

Meta

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.

Skill ansehen

subagent-driven-development

Entwicklung

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.

Skill ansehen

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.

Skill ansehen

cost-optimization

Andere

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.

Skill ansehen