npx claudepluginhub jacobpevans/claude-code-plugins --plugin git-workflowsThis skill uses the workspace's default tool permissions.
Diagnose and recover from rebase failures. Invoke when standard rebase error handling cannot resolve the issue.
Creates isolated Git worktrees for feature branches with prioritized directory selection, gitignore safety checks, auto project setup for Node/Python/Rust/Go, and baseline verification.
Executes implementation plans in current session by dispatching fresh subagents per independent task, with two-stage reviews: spec compliance then code quality.
Dispatches parallel agents to independently tackle 2+ tasks like separate test failures or subsystems without shared state or dependencies.
Diagnose and recover from rebase failures. Invoke when standard rebase error handling cannot resolve the issue.
Check: pwd, git status, git branch --show-current, git worktree list, gh pr view.
Branches have diverged. First, confirm your current branch: git branch --show-current.
If this is a feature branch (for example feature/foo) and the push was rejected:
git fetch origin && git rebase origin/maingit push --force-with-lease origin HEADIf you are on main and are behind origin/main, do not rebase main:
git fetch origin && git reset --hard origin/mainIf the rebase fails because origin/main moved again, repeat: fetch, rebase your feature branch, then push with --force-with-lease.
GH013 error about PR/status checks. This is NOT a block if commits are from approved PR.
Causes: CI not passing, reviews not approved, merge conflict.
Fix order: Rebase feature -> push (triggers CI) -> wait for checks -> merge to main -> push.
Check: gh pr view <branch> --json checks,reviews,statusCheckRollup
Nested .git directory found. Fix: git rm --cached <folder-name> or add to .gitignore.
Identify: git status, git diff --name-only --diff-filter=U
Resolve: edit files, git add <file>, then git rebase --continue (or --abort).
Main was updated between rebase and merge. Run git fetch origin && git reset --hard origin/main, then retry.
Fix: git push --force-with-lease origin <branch>
git rebase --abort && git status
Before retrying:
git diff origin/main --stat (should be empty)git status.git/rebase-{merge,apply} doesn't existgh pr view <branch> --json stateIf unresolved: check git reflog, review git log -10 --oneline, ask user.
DO NOT: Use --force (use --force-with-lease), use gh pr merge, run git rebase -i.