# Multi Repo Pull With Untracked Conflict Recovery

> Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes

- Skill: `vamseeachanta/multi-repo-pull-with-untracked-conflict-recovery` (Agent Skill)
- Install (CLI): `npx skillmds@latest add vamseeachanta/multi-repo-pull-with-untracked-conflict-recovery`
- Raw SKILL.md: https://api.skillmd.com/api/skills/vamseeachanta/multi-repo-pull-with-untracked-conflict-recovery/raw
- Safety review: PASS (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: vamseeachanta (https://skillmd.com/u/vamseeachanta)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/vamseeachanta/multi-repo-pull-with-untracked-conflict-recovery

---


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