skills.rest
saw4405
saw4405COMMUNITY
Explore all skills by this author →
GitHub

worktree-preview

Merge feature branches into a preview worktree for integrated testing.

Updated Jun 12, 2025
Search Tags:#git#vscode#worktree#integration-testing#conflict-resolution#development-tools#branch-merge
One-click install
npx skills add https://github.com/saw4405/splat-replay2 --skill worktree-preview
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: worktree-preview
Source: https://github.com/saw4405/splat-replay2/tree/main/.codex/skills/worktree-preview
Command: npx skills add https://github.com/saw4405/splat-replay2 --skill worktree-preview

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill helps development teams prepare a verification workspace by merging multiple feature branches into a single preview worktree, without altering the original branches, to streamline testing and validation.

Core Features & Use Cases

  • Rebuild and refresh a preview worktree to reflect merged changes from selected branches.
  • Merge specified branches into preview/integration, resolve conflicts on the preview side, and verify the combined state.
  • Add the updated worktree to development tooling like VS Code for easier navigation and inspection.

Quick Start

Run the setup script to create or refresh the preview worktree for integration testing.

Frequently Asked Questions about worktree-preview

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

FAQPage Schema
How do I test multiple feature branches together without altering the original branches?▼

You can create a dedicated preview worktree to merge and test multiple feature branches together without altering the original branches. This isolates integrated changes for validation before finalizing.

What is the best way to resolve merge conflicts when integrating several git branches?▼

Resolving merge conflicts during branch integration is handled on the preview side. The worktree combines branches into an integration workspace, allowing you to resolve conflicts and verify the combined state safely.

How do I add a git worktree to VS Code for inspecting merged changes?▼

After refreshing the preview worktree, you can optionally add it directly to VS Code. This integration allows for easier navigation and inspection of the merged branch state within your development environment.

Do I need a specific base branch to set up a preview worktree for integration testing?▼

Yes, setting up a preview worktree enforces a default base branch of main. This ensures all merged feature branches are validated against the primary codebase before integration testing begins.

Can I use a setup script to automate creating and refreshing a git worktree?▼

Yes, a dedicated setup script automates creating or refreshing the preview worktree. It coordinates automated merging and verification steps, then surfaces the results for review.

Why does merging multiple branches into one workspace help with integration testing?▼

Merging multiple branches into one workspace streamlines testing by providing a combined state for validation. This catches integration issues early without risking the stability of individual feature branches.

Related Skills

Explore More Software Engineering Skills→
good-ideagood-idea
3

using-git-worktrees

Create Git worktrees for isolated feature development and cleanup optionally deleting branches.

Community
Intermediate
netguy204netguy204
3

chunk-rebase

Merge trunk into the worktree and validate with tests before review.

Community
Intermediate
rjernstrjernst
1

merge

Merge a Git worktree branch into its detected base branch with approval.

Community
Intermediate
pwretmopwretmo

worktree-workflow

Automate git worktree setup, validation, commit, push, and PR creation via MCP.

Community
Advanced