Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
Scanned 9/9/2026
Install to Claude Code
Skills Directorynpx -y skills add vamseeachanta/workspace-hub --skill multi-repo-pull-with-untracked-conflict-recovery --agent claude-codeInstalls into .claude/skills of the current project.
Are you the author of Multi Repo Pull With Untracked Conflict Recovery?
Add the live security badge to your README — it updates automatically with every re-scan.
[](https://www.skillsdirectory.com/skills/vamseeachanta-multi-repo-pull-with-untracked-conflict-recovery)More formats (shields.io, HTML) on the badges page.
---
name: multi-repo-pull-with-untracked-conflict-recovery
description: Diagnose and resolve multi-repo pull failures caused by untracked files conflicting with remote changes
version: 1.0.0
source: auto-extracted
extracted: 2026-04-10
metadata:
tags: ["git", "multi-repo", "workflow", "debugging", "conflict-resolution"]
---
# 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.Is this your skill, or is something wrong with this listing? Request removal or report an issue. Author removals are honored within 72 hours.
No comments yet. Be the first to comment!
Ultra-compressed commit message generator. Cuts noise from commit messages while preserving intent and reasoning. Conventional Commits format. Subject ≤50 chars, body only when "why" isn't obvious. Use when user says "write a commit", "commit message", "generate commit", "/commit", or invokes /caveman-commit. Auto-triggers when staging changes.
Ultra-compressed code review comments. Cuts noise from PR feedback while preserving the actionable signal. Each comment is one line: location, problem, fix. Use when user says "review this PR", "code review", "review the diff", "/review", or invokes /caveman-review. Auto-triggers when reviewing pull requests.
一个全面的 Claude Code 会话验证系统。
Verification loop for Spring Boot projects: build, static analysis, tests with coverage, security scans, and diff review before release or PR.
Verification loop for Django projects: migrations, linting, tests with coverage, security scans, and deployment readiness checks before release or PR.
