skills.rest
NodeJSmith
NodeJSmithCOMMUNITY
Explore all skills by this author →
GitHub

mine.worktree-rebase

Detect non-default parent branches and rebase Git worktrees onto them.

1|Updated Feb 22, 2026
Search Tags:#git#git workflow#branching#worktree#code synchronization#rebase
One-click install
npx skills add https://github.com/NodeJSmith/Claudefiles --skill mine-worktree-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: mine.worktree-rebase
Source: https://github.com/NodeJSmith/Claudefiles/tree/main/skills/mine.worktree-rebase
Command: npx skills add https://github.com/NodeJSmith/Claudefiles --skill mine-worktree-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps maintain synchronization between a Git worktree and its parent repository's branch, preventing divergence and simplifying the rebase process.

Core Features & Use Cases

  • Worktree Synchronization: Detects if the parent repository is on a different branch than the default and offers to rebase the current worktree.
  • Conflict Management: Guides the user through rebase conflicts if they arise, providing options to continue or abort.
  • Use Case: After creating a new Git worktree for a feature, you can run this skill to ensure it's based on the latest changes in the main development branch before you start coding.

Quick Start

Run this skill immediately after entering a new Git worktree to check if a rebase is needed.

Frequently Asked Questions about mine.worktree-rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I rebase a git worktree onto its parent branch?▼

To rebase a git worktree, this skill validates the worktree status, identifies if the parent repository is on a non-default branch, and prompts you to confirm before executing `git rebase --onto`.

What happens if there are rebase conflicts in a git worktree?▼

When rebase conflicts occur in a git worktree, the skill pauses the operation and instructs you to manually resolve the conflicts, providing options to either continue or abort the rebase process.

When should I synchronize my git worktree with the parent repository?▼

You should synchronize your git worktree immediately after entering it to ensure it is based on the latest changes in the main development branch before you start coding, preventing branch divergence.

Can I use this to rebase a worktree onto a non-default branch?▼

Yes, the skill specifically detects if the parent repository is on a non-default branch and offers to rebase the current worktree onto that specific branch.

Does git rebase --onto work for worktree synchronization?▼

Yes, git rebase --onto is used by this skill to maintain synchronization between a worktree and its parent repository's branch, simplifying the process and preventing divergence.

Related Skills

Explore More Software Engineering Skills→
saxonthunesaxonthune
1

git-sync-worktree

Rebase a worktree branch onto the latest trunk with safety checks.

Community
Intermediate
izyanrajwaniizyanrajwani
4

finishing-a-development-branch

Automate Git branch completion with tests, base-branch selection, and merge or PR actions.

Community
Advanced
klhklh
9

git-workflow-and-versioning

Standardize Git workflows with trunk-based development and atomic commits.

Community
Advanced
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate