Switching branches with git switch - Step-by-Step Execution

Process Flow - Switching branches with git switch

Start in current branch

↓

Run 'git switch <branch>'

↓

Check if branch exists

↓

Switch to branch

↓

Update HEAD pointer

↓

Now on new branch

This flow shows how 'git switch' moves you from your current branch to another existing branch, or shows an error if the branch does not exist.

Execution Sample

Git

git switch feature
# Switches to branch named 'feature'

This command changes the current working branch to 'feature' if it exists.

Process Table

Step	Command	Branch Exists?	Action	Resulting Branch
1	git switch feature	Yes	Switch to 'feature'	feature
2	git switch bugfix	No	Error: branch not found	current branch unchanged

💡 Execution stops after switching branch or error if branch does not exist.

Status Tracker

Variable	Start	After Step 1	After Step 2
HEAD (current branch)	main	feature	main

Key Moments - 2 Insights

Why does 'git switch' give an error if the branch does not exist?

Because 'git switch' only moves to existing branches. The execution_table row 2 shows the error when trying to switch to 'bugfix' which does not exist.

Does 'git switch' create a new branch if it doesn't exist?

No, 'git switch' only switches to existing branches. To create and switch, you must use 'git switch -c <branch>'. This is why in the execution_table, step 2 fails.

Visual Quiz - 3 Questions

Look at the execution table, what is the current branch after step 1?

A feature

B main

C bugfix

D unknown

💡 Hint

Check the 'Resulting Branch' column in row 1 of the execution_table.

At which step does 'git switch' fail due to a missing branch?

A Step 1

B Step 2

C Neither step

D Both steps

💡 Hint

Look at the 'Branch Exists?' and 'Action' columns in the execution_table.

If you want to create and switch to a new branch in one command, what should you do?

A Use 'git checkout <branch>'

B Use 'git switch <branch>'

C Use 'git switch -c <branch>'

D Use 'git branch <branch>' only

💡 Hint

Refer to the key_moments section explaining creation with 'git switch -c'.

Concept Snapshot

git switch <branch>
- Switches to an existing branch named <branch>
- Fails with error if branch does not exist
- Use 'git switch -c <branch>' to create and switch
- Updates HEAD pointer to new branch
- Simple, safer alternative to 'git checkout' for switching branches

Full Transcript

The 'git switch' command changes your current working branch to another existing branch. When you run 'git switch <branch>', Git checks if the branch exists. If yes, it moves the HEAD pointer to that branch, making it the current branch. If the branch does not exist, Git shows an error and does not change the branch. To create a new branch and switch to it in one step, use 'git switch -c <branch>'. This command is a modern, clearer way to switch branches compared to the older 'git checkout'.

Practice

1. What does the command git switch feature do in a Git repository?

easy

A. It shows the list of all branches including 'feature'.

B. It creates a new branch named 'feature' without switching to it.

C. It changes the current branch to the branch named 'feature'.

D. It deletes the branch named 'feature'.

Solution

1. Step 1: Understand the git switch command

   The command git switch <branch-name> is used to change the current working branch to the specified branch.

2. Step 2: Apply to the given command

   Here, git switch feature changes the current branch to the existing branch named 'feature'.

3. Final Answer:

   It changes the current branch to the branch named 'feature'. -> Option C

4. Quick Check:

   git switch <branch> changes branch [OK]

Hint: Use git switch plus branch name to move branches fast [OK]

Common Mistakes:

• Thinking git switch creates a branch without -c
• Confusing git switch with git branch
• Assuming git switch deletes branches
• Believing git switch lists branches

2. Which of the following is the correct syntax to create and switch to a new branch named dev using git switch?

easy

A. git switch -c dev

B. git switch dev -c

C. git switch --new dev

D. git switch create dev

Solution

1. Step 1: Recall the syntax for creating and switching branches

   The correct syntax to create and switch to a new branch is git switch -c <branch-name>.

2. Step 2: Match the syntax with options

   git switch -c dev uses git switch -c dev, which is the correct form.

3. Final Answer:

   git switch -c dev -> Option A

4. Quick Check:

   git switch -c <branch> creates and switches [OK]

Hint: Use -c right after git switch to create and switch [OK]

Common Mistakes:

• Placing -c after branch name
• Using --new instead of -c
• Typing create instead of -c
• Omitting the -c flag

3. Given the following commands run in order:

git switch -c test
echo 'hello' > file.txt
git add file.txt
git commit -m 'Add file'
git switch main

What is the current branch and the status of file.txt after these commands?

medium

A. On branch 'main', file.txt is not present in main branch.

B. On branch 'test', file.txt is committed and present.

C. On branch 'main', file.txt is staged but not committed.

D. On branch 'test', file.txt is untracked.

Solution

1. Step 1: Analyze branch creation and commit

   The command git switch -c test creates and switches to 'test' branch. Then file.txt is created, added, and committed on 'test'.

2. Step 2: Switch back to main branch

   The command git switch main switches to 'main' branch. Since file.txt was committed only on 'test', it does not exist on 'main'.

3. Final Answer:

   On branch 'main', file.txt is not present in main branch. -> Option A

4. Quick Check:

   Switching branches changes files to that branch's state [OK]

Hint: Committed files stay only on their branch until merged [OK]

Common Mistakes:

• Assuming committed files appear on all branches
• Confusing staged and committed states
• Thinking switching branches keeps uncommitted changes
• Believing file.txt is tracked on main after switch

4. You try to run git switch feature but get the error: error: Your local changes to the following files would be overwritten by checkout:
What should you do to fix this and switch branches safely?

medium

A. Use git switch -f feature to force switch ignoring changes.

B. Commit or stash your changes before switching branches.

C. Delete the files manually and try again.

D. Run git reset --hard without saving changes.

Solution

1. Step 1: Understand the error meaning

   The error means you have local changes that would be lost if you switch branches.

2. Step 2: Safely save changes before switching

   You should either commit your changes or stash them to save work before switching branches.

3. Final Answer:

   Commit or stash your changes before switching branches. -> Option B

4. Quick Check:

   Save changes before switching to avoid overwrite errors [OK]

Hint: Commit or stash changes before switching branches [OK]

Common Mistakes:

• Forcing switch and losing work
• Deleting files manually causing data loss
• Resetting hard without backup
• Ignoring the error and expecting switch to work

5. You want to create a new branch release from main, switch to it, and keep your current uncommitted changes safe. Which sequence of commands achieves this correctly?

hard

A. git switch -c releasegit stashgit stash pop

B. git commit -m 'temp'git switch -c release

C. git switch releasegit stashgit switch -c release

D. git stashgit switch -c releasegit stash pop

Solution

1. Step 1: Save uncommitted changes safely

   Use git stash to save current uncommitted changes temporarily.

2. Step 2: Create and switch to new branch

   Run git switch -c release to create and switch to the 'release' branch.

3. Step 3: Restore saved changes

   Use git stash pop to apply the saved changes to the new branch.

4. Final Answer:

   git stash
   git switch -c release
   git stash pop -> Option D

5. Quick Check:

   Stash changes, switch branch, then pop stash [OK]

Hint: Stash changes before switching, then pop after [OK]

Common Mistakes:

• Switching branch before stashing causing errors
• Committing temporary changes unnecessarily
• Forgetting to pop stash after switching
• Trying to switch without saving changes