repo-cleanup-conflict-resolution-patterns

Sub-skill of repo-cleanup: Conflict Resolution Patterns (+2).

5 stars

Best use case

repo-cleanup-conflict-resolution-patterns is best used when you need a repeatable AI agent workflow instead of a one-off prompt.

Sub-skill of repo-cleanup: Conflict Resolution Patterns (+2).

Teams using repo-cleanup-conflict-resolution-patterns should expect a more consistent output, faster repeated execution, less prompt rewriting.

When to use this skill

You want a reusable workflow that can be run more than once with consistent structure.

When not to use this skill

You only need a quick one-off answer and do not need a reusable workflow.
You cannot install or maintain the underlying files, dependencies, or repository context.

Installation

Claude Code / Cursor / Codex

$curl -o ~/.claude/skills/conflict-resolution-patterns/SKILL.md --create-dirs "https://raw.githubusercontent.com/vamseeachanta/workspace-hub/main/.agents/skills/_internal/meta/repo-cleanup/conflict-resolution-patterns/SKILL.md"

Manual Installation

Download SKILL.md from GitHub
Place it in .claude/skills/conflict-resolution-patterns/SKILL.md inside your project
Restart your AI agent — it will auto-discover the skill

How repo-cleanup-conflict-resolution-patterns Compares

Feature / Agent	repo-cleanup-conflict-resolution-patterns	Standard Approach
Platform Support	Not specified	Limited / Varies
Context Awareness	High	Baseline
Installation Complexity	Unknown	N/A

Frequently Asked Questions

What does this skill do?

Sub-skill of repo-cleanup: Conflict Resolution Patterns (+2).

Where can I find the source code?

You can find the source code on GitHub using the link provided at the top of the page.

SKILL.md Source

# 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


```bash
# Rename conflicting files before merge
mv .agent-os/README.md .agent-os/README-legacy.md

# Create legacy subdirectory for scripts
mkdir -p .Codex/commands/legacy-scripts
git mv .agent-os/commands/* .Codex/commands/legacy-scripts/

# Preserve unique historical content
git mv .agent-os/implementation-history/ .Codex/docs/implementation-history/

# Find and remove exact duplicates (verify first)
md5sum .Codex/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

Related Skills

interactive-report-generator

from vamseeachanta/workspace-hub

Generate interactive HTML reports with Plotly visualizations from data analysis results. Supports dashboards, charts, and professional styling.

data-validation-reporter

from vamseeachanta/workspace-hub

Generate interactive validation reports with quality scoring, missing data analysis, and type checking. Combines Pandas validation, Plotly visualization, and YAML configuration for comprehensive data quality reporting.

repo-ecosystem-hygiene

from vamseeachanta/workspace-hub

Interpret the daily read-only repo ecosystem hygiene audit and route remediation through approved workflows.

mnt-analysis-cleanup

from vamseeachanta/workspace-hub

Survey, classify, and clean up `/mnt/local-analysis/` (or any sibling-to-workspace-hub directory holding orphan worktrees, codex-burn artifacts, agent log accumulations, and outer-clone duplicates) without losing useful code/work. Surfaces a tiered approval menu rather than baking decisions; defers all destructive ops until user confirms.

orcaflex-reporting-fixture-proof-pattern

from vamseeachanta/workspace-hub

Build and extend fixture-backed OrcaFlex reporting proof paths in digitalmodel using stable metadata baselines, normalized HTML snapshots, and reusable reporting test helpers.

pre-completion-cleanup-audit

from vamseeachanta/workspace-hub

Audit and dispose of session residue (orphan files, scratch dirs, sibling-repo state, locks, trash-stages) BEFORE claiming a task complete. Required gate before any agent says "all done", "task complete", or hands work back to user/orchestrator.

repo-sync

from vamseeachanta/workspace-hub

Smart repository synchronization across workspace-hub ecosystem — diagnoses and fixes pull failures (detached HEAD, diverged branches, uncommitted changes)

repo-structure

from vamseeachanta/workspace-hub

Canonical source layout, test mirroring, root cleanliness, gitignore, docs classification, and committed artifact rules for all workspace-hub tier-1 repos. Consult before creating directories or files in any submodule.

repo-portfolio-steering

from vamseeachanta/workspace-hub

Generate a one-page portfolio steering report for workspace-hub. Use when the user invokes /repo-portfolio-steering, asks about harness vs engineering balance, wants a portfolio health check, or asks which repos to fund next. Reports on portfolio steering, GTM readiness, and provider activity balance.

repo-mission-portfolio-audit

from vamseeachanta/workspace-hub

Audit the workspace-hub repo portfolio to extract each repo's mission, identify documentation gaps, and prioritize a plan/approval sequence with explicit LLM-wiki weighting for future issue triage.

mixed-ops-vs-repo-fix-plan-boundary

from vamseeachanta/workspace-hub

Plan mixed operational-vs-repo remediation issues by proving live-state classification first, then only proposing code changes for confirmed repo-owned failure paths.

work-around-merge-conflicts-in-test-execution

from vamseeachanta/workspace-hub

Run tests when repo has unresolved merge conflicts in config files by bypassing broken configs and executing tests directly