Creating a worktree in Git - Practice Exercises

Challenge - 5 Problems

💻 Command Output

intermediate

Output of creating a new worktree

What is the output of the following command if the branch feature-x does not exist yet?

git worktree add ../feature-x feature-x

Git

git worktree add ../feature-x feature-x

A error: pathspec 'feature-x' did not match any file(s) known to git

B fatal: 'feature-x' is not a commit and a branch 'feature-x' cannot be created from it.

C

Preparing worktree (detached HEAD) in ../feature-x
Branch 'feature-x' set up to track remote branch 'feature-x' from 'origin'.

D

Preparing worktree in ../feature-x
Switched to a new branch 'feature-x'

💡 Hint

The command creates a new branch and a new worktree directory.

The command creates a new worktree at ../feature-x and switches to a new branch named 'feature-x'. The output confirms the preparation and branch switch.

🧠 Conceptual

intermediate

Purpose of git worktree

Which of the following best describes the purpose of using git worktree?

A To create multiple working directories linked to the same repository, allowing simultaneous work on different branches.

B To permanently delete branches from the repository history.

C To clone a repository into a new directory with a different remote URL.

D To merge two branches automatically without conflicts.

💡 Hint

Think about working on multiple features at the same time.

git worktree allows you to have multiple working directories from the same repository, each checked out to different branches, so you can work on them simultaneously.

❓ Troubleshoot

advanced

Error when adding a worktree

You run the command git worktree add ../test-branch origin/test-branch but get the error:

fatal: 'origin/test-branch' is not a commit and a branch 'origin/test-branch' cannot be created from it.

What is the most likely cause?

A The directory '../test-branch' already exists and is not empty.

B The remote branch 'test-branch' does not exist locally or remotely, so git cannot create a worktree from it.

C You do not have permission to create directories in the parent folder.

D The git repository is corrupted and needs to be reinitialized.

💡 Hint

Check if the remote branch exists before adding a worktree.

Git requires the remote branch 'origin/test-branch' to exist locally or remotely to create a worktree from it. If it doesn't exist, it cannot create the worktree and shows this error.

🔀 Workflow

advanced

Steps to remove a worktree safely

Which sequence of commands correctly removes a git worktree located at ../feature-y and cleans up references?

A 1,3,4

B 2,3,4

C 1,4,3

D 3,1,4

💡 Hint

Use git commands to remove worktree and branch, then prune.

First remove the worktree with git worktree remove, then delete the branch with git branch -d, and finally clean up stale worktree references with git worktree prune.

✅ Best Practice

expert

Best practice for concurrent feature development

You want to work on two features simultaneously without switching branches in the same directory. Which is the best practice using git worktree?

A Clone the repository twice into different folders and work on each feature separately.

B Use <code>git stash</code> to save changes and switch branches in the same directory repeatedly.

C Create two separate worktrees, each checked out to a different feature branch, so you can work independently.

D Commit all changes to the main branch and then create feature branches later.

💡 Hint

Think about avoiding switching branches in one folder.

Using multiple worktrees allows you to have separate folders for each feature branch, avoiding the need to switch branches and reducing risk of conflicts.