Creating a worktree in Git - Why You Should Know This

The Big Idea

What if you could work on two features at once without losing your place or risking mistakes?

The Scenario

Imagine you are working on two different features in the same project. You need to switch back and forth between branches frequently. You try to do this by changing branches in your single project folder.

The Problem

Switching branches manually means you lose your current changes or have to stash them every time. It's slow and risky because you might forget to stash or accidentally overwrite work. Managing multiple features becomes confusing and error-prone.

The Solution

Creating a worktree lets you have multiple working directories linked to the same repository. Each worktree can be on a different branch, so you can work on multiple features side-by-side without switching or losing changes.

Before vs After

✗ Before

git checkout feature1
// work
git checkout feature2
// stash changes or risk conflicts

✓ After

git worktree add ../feature1 feature1
cd ../feature1
// work on feature1
cd -
git worktree add ../feature2 feature2
cd ../feature2
// work on feature2 simultaneously

What It Enables

You can work on multiple branches at the same time, speeding up development and reducing mistakes.

Real Life Example

A developer can fix a bug on the main branch while simultaneously developing a new feature on another branch, without losing progress or switching back and forth.

Key Takeaways

Manual branch switching is slow and risky.

Worktrees create separate folders for different branches.

This allows parallel work without conflicts or lost changes.

Practice

1. What is the main purpose of creating a Git worktree?

easy

A. To work on multiple branches simultaneously in separate folders

B. To merge two branches automatically

C. To delete a branch safely

D. To compress the repository size

Solution

1. Step 1: Understand what a worktree is

   A Git worktree allows you to have multiple working directories linked to the same repository.

2. Step 2: Identify the main use case

   This lets you work on different branches at the same time without switching branches in one folder.

3. Final Answer:

   To work on multiple branches simultaneously in separate folders -> Option A

4. Quick Check:

   Worktree = multiple branches, multiple folders [OK]

Hint: Worktrees = multiple branches open in separate folders [OK]

Common Mistakes:

• Thinking worktree merges branches
• Confusing worktree with branch deletion
• Believing worktree compresses repo

2. Which of the following is the correct syntax to create a new worktree for branch feature in folder ../feature-folder?

easy

A. git worktree add ../feature-folder feature

B. git worktree create feature ../feature-folder

C. git add worktree feature ../feature-folder

D. git worktree new ../feature-folder feature

Solution

1. Step 1: Recall the correct command structure

   The command to add a worktree is git worktree add <path> <branch>.

2. Step 2: Match the syntax with options

   git worktree add ../feature-folder feature matches the correct syntax exactly.

3. Final Answer:

   git worktree add ../feature-folder feature -> Option A

4. Quick Check:

   git worktree add path branch = correct syntax [OK]

Hint: Remember: 'git worktree add path branch' is correct syntax [OK]

Common Mistakes:

• Using 'create' instead of 'add'
• Swapping branch and path order
• Using 'git add worktree' which is invalid

3. Given the commands:

git worktree add ../test-branch test
cd ../test-branch
git branch --show-current

What will be the output of the last command?

medium

A. master

B. main

C. test

D. detached HEAD

Solution

1. Step 1: Understand what 'git worktree add' does

   This command creates a new folder with the specified branch checked out.

2. Step 2: Check current branch in new worktree

   After changing directory, git branch --show-current shows the branch name checked out, which is 'test'.

3. Final Answer:

   test -> Option C

4. Quick Check:

   Worktree folder shows branch name = test [OK]

Hint: Worktree folder shows the branch you added [OK]

Common Mistakes:

• Assuming default branch 'main' or 'master'
• Thinking it shows detached HEAD
• Confusing branch names

4. You run git worktree add ../new-feature without specifying a branch. What will happen?

medium

A. Git creates a new worktree with the current branch checked out

B. Git creates a new branch automatically

C. Git throws an error asking for a branch name

D. Git creates a detached HEAD worktree at the current commit

Solution

1. Step 1: Check behavior when branch is omitted

   If no branch is specified, Git creates a worktree at the current commit in detached HEAD state.

2. Step 2: Understand the result

   This means the worktree is not on any branch but on a specific commit.

3. Final Answer:

   Git creates a detached HEAD worktree at the current commit -> Option D

4. Quick Check:

   No branch given = detached HEAD worktree [OK]

Hint: No branch? Worktree is detached HEAD at current commit [OK]

Common Mistakes:

• Expecting an error without branch
• Thinking it uses current branch name
• Assuming a new branch is created

5. You want to work on two branches, main and feature, simultaneously. Your repo has no feature branch yet. Which sequence correctly creates a worktree for feature and switches to it?

hard

A. git worktree add ../feature feature
cd ../feature

B. git branch feature
git worktree add ../feature feature
cd ../feature

C. git worktree add ../feature feature
cd ../feature
git checkout -b feature

D. git checkout -b feature
git worktree add ../feature feature
cd ../feature

Solution

1. Step 1: Create the branch before adding worktree

   You must create the branch 'feature' first because it does not exist yet.

2. Step 2: Add the worktree for the new branch and switch directory

   Then add the worktree pointing to 'feature' and change to that folder.

3. Final Answer:

   git branch feature git worktree add ../feature feature cd ../feature -> Option B

4. Quick Check:

   Create branch first, then add worktree [OK]

Hint: Create branch first, then add worktree for it [OK]

Common Mistakes:

• Adding worktree before branch exists
• Creating branch inside worktree folder
• Forgetting to switch directory