Replay worktree branch commits onto master as linear history, then remove the worktree and branch.
npx skills add https://github.com/thurn/dotfiles --skill wtcleanup-thurn
Please help me install this Agent Skill. Skill: wtcleanup Source: https://github.com/thurn/dotfiles/tree/main/.llms/skills/wtcleanup Command: npx skills add https://github.com/thurn/dotfiles --skill wtcleanup-thurn
merge --ff-only first and falls back to cherry-pick master..branch when master has advanced, avoiding the dangerous git rebase that rewrites published commits. - Protected Cleanup: Removes the worktree and deletes its branch only after promotion succeeds, and never touches untracked or modified files in the user's primary working tree. - Use Case: After finishing a feature in a worktree created by the wt skill, invoke this skill to land those commits on master as a clean linear history and dispose of the temporary worktree. ## Quick Start Ask the AI to run the wtcleanup skill to promote the current worktree's commits onto master and remove the worktree and its branch.High-intent search queries and answers about installing and using this skill.
Check out master and first try git merge --ff-only with the worktree branch. If master has advanced, use git cherry-pick master..branch to replay the branch's unique commits in order, resolving conflicts as they arise.
Run git worktree remove with the worktree path, then git branch -D with the branch name. Only do this after the commits have been successfully promoted onto master, since branch -D force-deletes the branch.
Running git rebase branch while on master replays master's own commits on top of the branch, rewriting already-published commits so they diverge from origin/master and require a force-push. Use merge --ff-only or cherry-pick instead.
Untracked and modified files in the primary working tree are left exactly as they are. The promotion only cherry-picks or merges the worktree branch's commits and never runs git clean, checkout --, or stash on the user's files.
Resolve each conflict as it arises during the cherry-pick, keeping every commit separate rather than squashing. Afterward, verify with git log --oneline that master is a linear history and has not diverged from origin/master.
AnthonyPoschenCreate, synchronize, and retire Git worktrees in a mirrored directory layout.
Apostolos-DelisRebase a Git branch onto a base branch with conflict resolution and safe pushing.
VIPER-MetricsImplement approved feature plans using git worktrees and phased execution.
duanegoodnerMerges a GitHub pull request via squash and removes the feature branch.