multi-repo-pull-with-untracked-conflict-recovery
Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
Best use case
multi-repo-pull-with-untracked-conflict-recovery is best used when you need a repeatable AI agent workflow instead of a one-off prompt.
Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
Teams using multi-repo-pull-with-untracked-conflict-recovery 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
Manual Installation
- Download SKILL.md from GitHub
- Place it in
.claude/skills/multi-repo-pull-with-untracked-conflict-recovery/SKILL.mdinside your project - Restart your AI agent — it will auto-discover the skill
How multi-repo-pull-with-untracked-conflict-recovery Compares
| Feature / Agent | multi-repo-pull-with-untracked-conflict-recovery | 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?
Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
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
# Multi-Repo Pull with Untracked Conflict Recovery When a multi-repo pull fails due to untracked local files conflicting with incoming remote files, use `git stash -u` (not plain `git stash`) to capture both tracked and untracked changes. This temporarily moves marker files like `.codex/` and `.Codex/skills/` out of the way before pulling. After pull succeeds, restore the stash and verify no conflict markers remain — then safely drop the stash. This pattern handles the common case where workflow metadata or generated files block standard pulls in workspace ecosystems.
Related Skills
interactive-report-generator
Generate interactive HTML reports with Plotly visualizations from data analysis results. Supports dashboards, charts, and professional styling.
data-validation-reporter
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
Interpret the daily read-only repo ecosystem hygiene audit and route remediation through approved workflows.
orcaflex-reporting-fixture-proof-pattern
Build and extend fixture-backed OrcaFlex reporting proof paths in digitalmodel using stable metadata baselines, normalized HTML snapshots, and reusable reporting test helpers.
repo-sync
Smart repository synchronization across workspace-hub ecosystem — diagnoses and fixes pull failures (detached HEAD, diverged branches, uncommitted changes)
repo-structure
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
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
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
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
Run tests when repo has unresolved merge conflicts in config files by bypassing broken configs and executing tests directly
repo-separation-for-sensitive-data
Architecture pattern for splitting confidential data and reusable algorithms across repos
nested-git-repo-stash-safety
How to safely stash changes in a parent repo containing dirty nested git repositories