Git Notes
HubBenefits of Git and GitHub - Why They MatterGit vs GitHubVersion Control SystemWhat Is GitWhat Is GitHubConfigure Git - User Identity and SettingsCreate GitHub Account - Sign Up GuideFirst Git Repository - Getting StartedInstall Git on Linux - Complete Setup GuideInstall Git on macOS - Installation GuideInstall Git on Windows - Step-by-Step GuideGit Add - Stage ChangesGit Clone - Copy Remote Repositories LocallyGit Commit - Save ChangesGit Diff - Compare Changes in Your RepositoryGit Ignore - Exclude Files from Version ControlGit Init - Initialize RepositoryGit Log - View Commit HistoryGit Status - Check Repository StateGit Fetch - Download Remote Changes Without MergingGit Pull - Fetch and Merge Remote ChangesGit Push - Upload Local Commits to Remote RepositoryGit Remote - Manage Remote Repository ConnectionsLocal Repository - Understanding Your Git Working EnvironmentRemote Repository - Collaborate Through Shared RepositoriesSync Local and Remote - Keep Repositories in HarmonyAmend Commit - Fix Last CommitDelete Branch - Clean Up BranchesGit Reset - Move HEAD and Undo CommitsGit Restore - Discard ChangesGit Revert - Safely Undo ChangesRecover Lost Commits - Reflog GuideFork RepositoryGitHub PagesGitHub Profile SetupGitHub RepositoriesGitHub Stars and WatchersRepository SettingsCode ReviewsGit CloneGit FetchGit PullGit PushGitHub IssuesLabels and MilestonesOpen Source ContributionsGitHub Project BoardsPull Requests - Propose and Review Code ChangesTeam Collaboration with Git and GitHubAutomated Testing with GitHub ActionsCI/CD with GitHub ActionsDeployment Automation with GitHub ActionsIntroduction to GitHub ActionsGitHub Actions RunnersGitHub Actions WorkflowsEnterprise Git Workflows - Scale Git for Large OrganizationsFeature Branch Workflow - Isolate Development WorkGitFlow Workflow - Structured Release ManagementMonorepo Workflow - Manage Multiple Projects in One RepositoryTrunk-Based Development - Ship Code Fast and SafelyDeployment WorkflowsGitHub Pages DeploymentNetlify Deployment from GitHubRender Deployment from GitHubVercel Deployment from GitHubBranch Protection Rules - Secure Your Git BranchesPersonal Access Tokens - Authenticate with GitHubRepository Security Best PracticesSecret Scanning - Detect Leaked Credentials in CodeSigned Commits - Verify Commit Authenticity with GPGSSH Keys - Secure Git Authentication Without PasswordsGit Bisect - Find Bugs with Binary SearchGit Cherry-Pick - Apply Specific Commits to Any BranchGit Hooks - Automate Workflows with Git EventsGit Internals - Understanding How Git Works Under the HoodGit Stash - Temporarily Save Uncommitted ChangesGit Submodules - Manage External Dependencies as Git ReposGit Tag - Mark Important Points in HistoryGit Worktrees - Work on Multiple Branches SimultaneouslyCollaborative Web App ProjectComplete Team Workflow ProjectGitHub Actions Project - Build a CI/CD PipelineOpen Source Project Contribution - Guided ExercisePortfolio Project with Git - Showcase Your SkillsGit Command CheatsheetGit Interview Questions - Comprehensive Preparation GuideGitHub Interview QuestionsScenario-Based Git Interview QuestionsGit Troubleshooting GuideGit Best Practices - Professional Development HabitsCommon Git Errors and Fixes - Quick SolutionsGit Command Reference - Complete Command GuideLearning Resources - Continue Your Git & GitHub EducationBranch Strategies - Choosing the Right Git Branching ModelCreate Branch in Git - Start New Development LinesFast-Forward Merge in Git - Clean Linear HistoryGit BranchGit CheckoutGit MergeGit RebaseMerge Branches in Git - Combine Development WorkMerge Conflicts - Resolve Git Conflicts Like a ProSwitch Branch in Git - Navigate Between Branches
Learn Git worktrees to check out multiple branches at the same time in separate directories. Avoid constant stashing and branch switching.
Git worktrees let you check out multiple branches of the same repository in separate directories simultaneously. Instead of stashing and switching branches, you can have each branch in its own folder.
The Problem Worktrees Solve
Without worktrees, you constantly switch context:
bash example
# Traditional painful workflow
git stash # Save current work
git checkout hotfix # Switch to hotfix
# ... fix the bug ...
git checkout feature # Switch back
git stash pop # Restore workWith worktrees, each branch lives in its own directory:
~/projects/
├── my-app/ # Main worktree (feature branch)
├── my-app-hotfix/ # Linked worktree (hotfix branch)
└── my-app-review/ # Linked worktree (PR review)
Creating Worktrees
Basic Worktree
bash example
# From your main repository
cd ~/projects/my-app
# Create a worktree for the hotfix branch
git worktree add ../my-app-hotfix hotfix/critical-bugOutput
Preparing worktree (checking out 'hotfix/critical-bug') HEAD is now at a1b2c3d Fix database connection
Create with a New Branch
bash example
git worktree add -b feature/new-api ../my-app-api mainOutput
Preparing worktree (new branch 'feature/new-api') HEAD is now at b2c3d4e Latest main commit
Create from Remote Branch
bash example
git worktree add ../my-app-review origin/feature/colleague-workListing Worktrees
bash example
git worktree listOutput
/home/user/projects/my-app a1b2c3d [feature/dashboard] /home/user/projects/my-app-hotfix b2c3d4e [hotfix/critical-bug] /home/user/projects/my-app-api c3d4e5f [feature/new-api]
bash example
# Verbose output
git worktree list --porcelainWorking with Worktrees
Each worktree is a fully functional checkout:
bash example
# Work in the hotfix worktree
cd ../my-app-hotfix
git status
# Make changes, commit, push - normal Git operations
git add .
git commit -m "Fix critical database bug"
git push origin hotfix/critical-bug
# Go back to your feature work - no stashing needed!
cd ../my-app
# Your feature work is exactly as you left itRemoving Worktrees
bash example
# Remove after you are done (clean working directory)
git worktree remove ../my-app-hotfixOutput
# No output on success
bash example
# Force remove (even with uncommitted changes)
git worktree remove --force ../my-app-hotfix
# If you deleted the directory manually, clean up references
git worktree prunePractical Workflows
Code Review Workflow
bash example
# Reviewing a PR without leaving your current work
git fetch origin
git worktree add ../review-pr-42 origin/feature/user-settings
cd ../review-pr-42
# Run tests, review code
npm test
# Done reviewing
cd ../my-app
git worktree remove ../review-pr-42Parallel Development
bash example
# Working on frontend and backend simultaneously
git worktree add ../my-app-backend feature/backend-api
git worktree add ../my-app-frontend feature/frontend-ui
# Terminal 1: Backend development
cd ../my-app-backend
npm run dev:server
# Terminal 2: Frontend development
cd ../my-app-frontend
npm run dev:clientTesting Against Main
bash example
# Quick comparison against main
git worktree add ../my-app-main main
# Run tests on main to compare
cd ../my-app-main
npm test
# Compare results with your feature branchWorktree Constraints
- A branch can only be checked out in ONE worktree at a time
- Worktrees share the same
.gitobjects (space efficient) - Each worktree has its own staging area and working directory
- Commits in any worktree are visible to all others
bash example
# This will fail - branch already checked out
git worktree add ../another-dir mainOutput
fatal: 'main' is already checked out at '/home/user/projects/my-app-main'
Interview Questions
- What are Git worktrees and when would you use them?
Worktrees let you check out multiple branches in separate directories simultaneously. Use them when you need to work on multiple branches concurrently — hotfixes, code reviews, or parallel feature development — without stashing or losing context.
- How do worktrees differ from cloning the repository multiple times?
Worktrees share the same .git directory and objects, using minimal extra disk space. Multiple clones duplicate all objects. Worktrees also ensure branch exclusivity — a branch can only be in one worktree.
- Can you have the same branch checked out in multiple worktrees?
No. Git prevents this to avoid conflicting changes. Each branch can only be checked out in one worktree at a time.
- How do you clean up after removing a worktree directory manually?
Run git worktree prune to clean up stale worktree references. This removes entries for worktrees whose directories no longer exist.
- What gets shared between worktrees and what is independent?
Shared: Git objects, refs, hooks, config. Independent: working directory, staging area (index), HEAD. Commits made in any worktree are immediately visible to all others.
Exam Focus
Revise definitions, diagrams, examples, and short-answer points for Git Worktrees - Work on Multiple Branches Simultaneously.
Interview Use
Prepare one clear explanation, one practical example, and one common mistake for this Git & GitHub topic.
Search Terms
git-github, git & github, git, github, advanced, worktrees, git worktrees - work on multiple branches simultaneously
Related Git & GitHub Topics
Continue learning this concept
Advanced GitGit Bisect - Find Bugs with Binary SearchLearn how to use git bisect to efficiently find the commit that introduced a bug using binary search. Master automated bisect with scripts and practical debugging workflows.Advanced GitGit Cherry-Pick - Apply Specific Commits to Any BranchLearn how to use git cherry-pick to apply individual commits from one branch to another. Master cherry-pick options, conflict resolution, and best practices.Advanced GitGit Hooks - Automate Workflows with Git EventsLearn to use Git hooks for automating code quality checks, commit message validation, pre-push testing, and deployment triggers. Covers client-side and server-side hooks.Advanced GitGit Internals - Understanding How Git Works Under the HoodDeep dive into Git internals including objects (blobs, trees, commits), the SHA-1 hash system, packfiles, refs, and how Git stores data as a content-addressable filesystem.Advanced GitGit Stash - Temporarily Save Uncommitted ChangesMaster git stash to save work-in-progress changes without committing. Learn stash operations, named stashes, partial stashing, and workflow patterns.Advanced GitGit Submodules - Manage External Dependencies as Git ReposLearn how to use Git submodules to include external repositories within your project. Cover adding, updating, cloning with submodules, and alternatives.