convert-worktree

To convert a git worktree into a regular local branch, run this skill from within the worktree. It rebases onto the latest base branch, removes the worktree, and checks out the branch in your main workspace.

The best way to rebase a worktree onto the main branch is using an automated conversion process. It dynamically detects the base branch, applies the rebase for linear history, and removes the now-unused worktree.

Worktree conversion performs project cleanup prior to the rebase to preserve environment integrity. The process is non-blocking, ensuring the conversion never fails entirely due to cleanup issues.

Yes, you can preserve WIP commits when converting a worktree. The conversion process satisfies requirements for WIP commits, integrating them into the local branch during the non-blocking rebase.

Yes, worktree conversion works with both main and master base branches. The process features dynamic base branch detection to automatically identify and rebase onto the correct primary branch.

You should remove a worktree after finishing work to transfer your changes into a clean, tracked local branch in the main workspace. This removes the now-unused worktree, keeping your repository organized.