What causes an 'ambiguous refname' warning in Git?

This usually occurs when a local branch is accidentally created with the same name as a remote tracking branch (e.g., 'origin/main'). This skill identifies the conflict and removes the redundant local reference.

How does this skill identify worktree paths?

It uses standardized discovery commands like 'git worktree list' and parses the output to find the exact file system paths for main and feature branches rather than assuming directory structures.

Can this skill help recover lost work?

Yes, it includes procedures to check for uncommitted changes and provides options to stash or commit work before performing disruptive operations like hard resets or worktree removal.

When should I use the 'Fresh Worktree' recovery option?

Use this when a worktree becomes corrupted or its path is manually deleted from the disk without using Git commands, leaving the repository in an inconsistent state.

Git Worktree Troubleshooter

Name: Git Worktree Troubleshooter
Author: JacobPEvans

byJacobPEvans

•

개발자 도구

Resolves complex Git worktree, branch conflicts, and ambiguous reference errors with automated diagnostics and recovery patterns.

This skill provides Claude with advanced expertise for managing Git worktrees and resolving common yet frustrating issues like 'ambiguous refname' errors. It enables Claude to accurately discover worktree paths, fix synchronization issues between main and feature branches, and recover from corrupted states such as embedded repositories or missing worktree links. By following standardized diagnostic commands and robust recovery workflows, this skill ensures that your development environment remains clean and functional even during complex multi-branch operations.

주요 기능

01Detection and resolution of 'ambiguous refname' (local vs. remote) conflicts.

022 GitHub stars

03Force-reset and fresh worktree creation for severely broken repository states.

04Safe management of uncommitted changes via stashing or commit-before-repair patterns.

05Automated worktree discovery and path verification to prevent command failures.

06Step-by-step recovery workflows for missing main or branch worktrees.

사용 사례

01Resolving 'warning: refname is ambiguous' errors that block standard Git operations.

02Cleaning up embedded Git repositories and fixing .gitignore issues in complex projects.

03Re-syncing a local multi-worktree setup that has fallen out of sync with the remote origin.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jacobpevans/claude-code-plugins troubleshoot-worktree

For use in Claude.ai and ChatGPT

Download Skill