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 how to switch between branches using git checkout and git switch. Understand branch switching behavior, stashing changes, and handling uncommitted work.
Switching branches changes your working directory to reflect the state of the target branch. Git provides two commands for this: the traditional git checkout and the modern git switch.
Switching with git switch (Recommended)
The git switch command was introduced in Git 2.23 specifically for branch switching:
bash example
git switch branch-nameOutput
Switched to branch 'branch-name'
Create and Switch
bash example
git switch -c new-branch-nameOutput
Switched to a new branch 'new-branch-name'
Switch to Previous Branch
bash example
git switch -Output
Switched to branch 'main'
Switching with git checkout (Traditional)
bash example
git checkout branch-nameOutput
Switched to branch 'branch-name'
Create and Switch
bash example
git checkout -b new-branch-namegit switch vs git checkout
| Feature | git switch | git checkout |
|---|---|---|
| Switch branches | ✅ git switch main | ✅ git checkout main |
| Create + switch | ✅ git switch -c new | ✅ git checkout -b new |
| Restore files | ❌ Use git restore | ✅ git checkout -- file |
| Detached HEAD | git switch --detach | git checkout commit |
| Clarity | Single purpose | Overloaded (branches + files) |
git switch is preferred because it has a single clear purpose — switching branches.
What Happens When You Switch
When you switch branches, Git:
- Updates files in the working directory to match the target branch
- Moves the HEAD pointer to the target branch
- Updates the staging area to match the target branch
| HEAD | feature → [commit C] |
| After | git switch main |
| HEAD | main → [commit B] |
Handling Uncommitted Changes
Clean Working Directory (No Issues)
bash example
git switch developOutput
Switched to branch 'develop'
Uncommitted Changes That Don't Conflict
If your uncommitted changes don't conflict with the target branch, Git carries them along:
bash example
# You have changes in file-A.txt (not modified on develop)
git switch developOutput
M file-A.txt Switched to branch 'develop'
Uncommitted Changes That Conflict
bash example
git switch mainOutput
error: Your local changes to the following files would be overwritten by checkout:
app.js
Please commit your changes or stash them before you switch branches.
AbortingSolutions for Blocked Switch
Option 1: Commit Your Work
bash example
git add .
git commit -m "WIP: save progress on feature"
git switch mainOption 2: Stash Changes
bash example
git stash
git switch main
# ... do work on main ...
git switch feature-branch
git stash popOption 3: Discard Changes
bash example
# Discard all uncommitted changes (CAREFUL - permanent!)
git checkout -- .
git switch mainOption 4: Force Switch (Discards Changes)
bash example
git switch -f main
# or
git checkout -f mainSwitching to Remote Branches
First Time (Create Local Tracking Branch)
bash example
git switch remote-branch-name
# Git auto-creates local branch tracking origin/remote-branch-nameOutput
Branch 'remote-branch-name' set up to track remote branch 'remote-branch-name' from 'origin'. Switched to a new branch 'remote-branch-name'
If Multiple Remotes Have Same Branch Name
bash example
git switch -c local-name origin/branch-nameDetached HEAD State
Switching to a commit (not a branch) puts you in detached HEAD:
bash example
git switch --detach abc1234
# or
git checkout abc1234Output
HEAD is now at abc1234 Some commit message
In detached HEAD, new commits are not on any branch. To keep work done here:
bash example
# Create a branch before switching away
git switch -c save-my-workPractical Workflows
Quick Context Switch
bash example
# Working on feature, need to check something on main
git stash
git switch main
# ... check something ...
git switch - # Back to feature
git stash popReview a Colleague's Branch
bash example
git fetch origin
git switch colleague/feature-branch
# Review their code
git switch - # Back to your branchSwitch Between Multiple Features
bash example
git switch feature/auth # Work on auth
git switch feature/dashboard # Switch to dashboard
git switch feature/auth # Back to auth
git switch - # Quick toggle to last branchInterview Questions
- What is the difference between
git switchandgit checkout?
git switch is dedicated to branch switching only (introduced in Git 2.23). git checkout is overloaded — it switches branches AND restores files. git switch is clearer and less error-prone.
- What happens to uncommitted changes when you switch branches?
If changes dont conflict with the target branch, they are carried along. If they conflict, Git blocks the switch and asks you to commit or stash changes first.
- What is a detached HEAD state?
Detached HEAD means HEAD points directly to a commit instead of a branch. Any new commits made in this state will be orphaned when you switch to another branch, unless you create a branch first.
- How do you quickly switch to the previous branch?
Use git switch - or git checkout -. The dash refers to the previously checked-out branch, similar to cd - in shell.
- How do you switch to a remote branch you have never checked out locally?
Simply use git switch branch-name. If a matching remote branch exists, Git automatically creates a local tracking branch and switches to it.
Exam Focus
Revise definitions, diagrams, examples, and short-answer points for Switch Branch in Git - Navigate Between Branches.
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, branching, and, merging, switch
Related Git & GitHub Topics
Continue learning this concept
Branching And MergingBranch Strategies - Choosing the Right Git Branching ModelExplore popular Git branching strategies including GitFlow, GitHub Flow, and trunk-based development. Learn when to use each strategy for your team and project.Branching And MergingCreate Branch in Git - Start New Development LinesLearn how to create branches in Git for feature development, bug fixes, and experimentation. Understand branch creation from different starting points.Branching And MergingGit BranchBranching is one of the most powerful features in Git, and understanding how to work with branches effectively is what separates a beginner from a...Branching And MergingFast-Forward Merge in Git - Clean Linear HistoryUnderstand fast-forward merges in Git, when they happen, how they differ from three-way merges, and how to control merge behavior with --no-ff and --ff-only flags.Branching And MergingGit CheckoutThe git checkout command is one of the most versatile commands in Git, which is both its strength and its source of confusion for newcomers. Historically,...Branching And MergingGit MergeMerging is the process of combining the work from two different branches into one. It is how features developed in isolation come together to form a...