MCP HubMCP Hub
スキル一覧に戻る

repo-cleanup-conflict-resolution-patterns

vamseeachanta
更新日 Today
12 閲覧
3
2
3
GitHubで表示
その他general

について

このスキルは、リポジトリ構造をマージする際の競合解決パターンとコマンドを提供します。特にコードベースを統合する場合に有用です。ファイル名の競合、類似したコンテンツ、重複ファイルの処理に関する具体的な戦略と、実行可能なbashコマンドを提示します。開発者はリポジトリのクリーンアップ作業中にこれを使用し、履歴コンテキストを保持しながら体系的なマージ競合の解決を行えます。

クイックインストール

Claude Code

推奨
メイン
npx skills add vamseeachanta/workspace-hub
プラグインコマンド代替
/plugin add https://github.com/vamseeachanta/workspace-hub
Git クローン代替
git clone https://github.com/vamseeachanta/workspace-hub.git ~/.claude/skills/repo-cleanup-conflict-resolution-patterns

このコマンドをClaude Codeにコピー&ペーストしてスキルをインストールします

ドキュメント

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 リポジトリ

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

関連スキル

algorithmic-art

メタ

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.

スキルを見る

subagent-driven-development

開発

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.

スキルを見る

executing-plans

デザイン

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.

スキルを見る

cost-optimization

その他

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.

スキルを見る