Chapter 3: Branch, Merge, Rebase, Stash and Pull Requests

3.2 branch, switch, list, delete

By Ravindra Bagale · Last updated: 25 October 2026

Why: the problem

In a normal day at Infosys you will create, switch, list, rename and delete branches many times. If you do it wrong, you lose work or push the wrong code. For example, git branch -D deletes a branch even if it has commits nobody merged, and those commits can be lost. Old tutorials use git checkout for everything, which is confusing because checkout also throws away file edits. New Git gives two clear commands: git switch for branches and git restore for files. In this lesson you will practise every branch command on hello-shop with real output: create, switch, list local and remote, rename, track a remote branch, push a branch, and delete it safely on your laptop and on the server.

What we will build

You will create three branches in hello-shop, push one to gitlab.com, check out a teammate's remote branch, rename one, and delete merged and unmerged branches the safe way.

What: every term in plain English

• git switch NAME — Move to an existing branch.
• git switch -c NAME — Create a branch and move to it.
• git branch — List local branches.
• git branch -a — List local and remote-tracking branches.
• git branch -m OLD NEW — Rename a branch.
• git branch -d NAME — Delete a branch only if it is merged.
• git branch -D NAME — Force delete, even if not merged. Careful.
• git push origin --delete NAME — Delete the branch on the server.

How: step by step

1. Go to the repo

   cd ~/devops-lab/hello-shop && git switch -q main
   

   What it does: Start on main.

   Output

   (no output)
   

2. Create and switch

   git switch -c feature/menu
   

   What it does: New branch from main.

   Output

   Switched to a new branch 'feature/menu'
   

3. Commit on it

   echo "menu=idli,dosa" > menu.txt && git add . && git commit -qm "Add menu file"
   

   What it does: The commit belongs to feature/menu.

   Output

   (no output)
   

4. List with last commit

   git branch -v
   

   What it does: Each branch and its latest commit.

   Output

   * feature/menu 3a3a3a3 Add menu file
     main         e1f2a3b Set price to 149
   

5. Push and track

   git push -u origin feature/menu
   

   What it does: Creates the branch on the server.

   Output

   * [new branch]      feature/menu -> feature/menu
   branch 'feature/menu' set up to track 'origin/feature/menu'.
   

6. Rename

   git branch -m feature/menu feature/SHOP-201-menu
   

   What it does: Clearer name with the ticket.

   Output

   (no output)
   

7. Delete merged branch

   git switch -q main && git merge -q feature/SHOP-201-menu && git branch -d feature/SHOP-201-menu
   

   What it does: Safe delete after merge.

   Output

   Deleted branch feature/SHOP-201-menu (was 3a3a3a3).
   

Example 1: Work on a teammate's branch from the server

Stack. Git

Goal. Work on a teammate's branch from the server.

remote-branch.sh

git fetch origin
git branch -r
git switch fix/SHOP-150-payment-timeout
git branch -vv
git log --oneline -2

What each line does

• git fetch origin — Get the latest branch list.
• git branch -r — Remote-tracking branches.
• git switch NAME — If a remote branch has that name, Git makes a local one that tracks it.
• branch -vv — Shows the tracking link.

Green output

  origin/main
  origin/fix/SHOP-150-payment-timeout
branch 'fix/SHOP-150-payment-timeout' set up to track 'origin/fix/SHOP-150-payment-timeout'.
Switched to a new branch 'fix/SHOP-150-payment-timeout'
* fix/SHOP-150-payment-timeout 9c8b7a6 [origin/fix/SHOP-150-payment-timeout] Raise payment timeout to 10s

Expected result. You can test or help on a teammate's branch in two commands.

Example 2: See why -d protects you and -D does not

Stack. Git

Goal. See why -d protects you and -D does not.

delete.sh

git switch -qc experiment
echo "x" > exp.txt && git add . && git commit -qm "Try idea"
git switch -q main
git branch -d experiment
git branch -D experiment
git reflog | grep "Try idea"

What each line does

• git branch -d — Refuses: the commit is not merged.
• git branch -D — Deletes anyway.
• git reflog — The commit can still be found for a while.

Green output

error: the branch 'experiment' is not fully merged.
hint: If you are sure you want to delete it, run 'git branch -D experiment'.
Deleted branch experiment (was 7d7d7d7).
7d7d7d7 HEAD@{2}: commit: Try idea

Expected result. Use -d by habit. Use -D only when you are sure the work is not needed.

Example 3: Rename a branch that is already on the server

Stack. Git

Goal. Rename a branch that is already on the server.

rename-remote.sh

git switch -qc feature/menuu
git push -q -u origin feature/menuu
git branch -m feature/menu
git push -q -u origin feature/menu
git push origin --delete feature/menuu
git branch -a | grep menu

What each line does

• feature/menuu — A typo already pushed.
• git branch -m — Fix the name locally.
• push -u origin feature/menu — Push the new name.
• push --delete — Remove the old name on the server.

Green output

 - [deleted]         feature/menuu
* feature/menu
  remotes/origin/feature/menu

Expected result. The server and laptop both have only the right name.

Example 4: Clean up branches that are already merged

Stack. Git, xargs

Goal. Clean up branches that are already merged.

cleanup.sh

git switch -q main && git pull -q
git branch --merged main
git branch --merged main | grep -v -E "^\*|main$" | xargs -r git branch -d
git fetch --prune
git branch -a

What each line does

• --merged main — Branches fully inside main.
• grep -v ... — Never delete main or the current branch.
• xargs -r git branch -d — Delete each, safely.
• fetch --prune — Remove remote-tracking branches deleted on the server.

Green output

  feature/menu
  fix/SHOP-150-payment-timeout
* main
Deleted branch feature/menu (was 3a3a3a3).
Deleted branch fix/SHOP-150-payment-timeout (was 9c8b7a6).
 - [deleted]         (none)     -> origin/feature/menuu
* main
  remotes/origin/main

Expected result. A tidy branch list. Many teams do this every Friday.

Example 5: Find which branches contain a commit

Stack. Git

Goal. Find which branches contain a commit.

contains.sh

git branch --contains 9c8b7a6
git branch -r --contains 9c8b7a6
git branch --no-merged main

What each line does

• --contains — Branches that have this commit.
• -r — Check remote branches too.
• --no-merged — Branches with work not in main yet.

Green output

* main
  origin/main
  feature/coupon

Expected result. You know if a fix reached main before you close the ticket.

Verify: did it work?

1. Current branch

   git branch --show-current
   

   What it does: Should be main.

   Output

   main
   

2. No stale branches

   git branch | wc -l
   

   What it does: Only main left.

   Output

   1
   

3. Server list

   git ls-remote --heads origin
   

   What it does: What the server has.

   Output

   e1f2a3b...  refs/heads/main
   

When it is red 1

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

Cause. No such branch locally or on the remote you fetched.

Fix, step by step

1. git fetch
2. git branch -a to check the name.

When it is red 2

error: Cannot delete branch 'main' checked out at '/home/ravi/devops-lab/hello-shop'

Cause. You cannot delete the branch you are on.

Fix, step by step

1. git switch another branch first.

When it is red 3

error: the branch 'experiment' is not fully merged.

Cause. Safety check from -d.

Fix, step by step

1. Merge it first, or use -D if you are sure.

When it is red 4

remote: GitLab: You are not allowed to delete protected branch main.

Cause. main is protected on the server.

Fix, step by step

1. Good. Do not delete main.

Cleanup

1. Back to main

   git switch -q main
   

   What it does: Leave the repo on main.

   Output

   (no output)
   

Practice tasks

Homework: try at home

Recap

• switch for branches, restore for files.
• -c creates; -m renames.
• -d is safe; -D forces.
• push -u shares and tracks.
• --merged and --prune keep things tidy.

FAQ

Is git checkout still OK?

Yes, it works, but switch and restore are clearer.

Why does my new branch not appear for teammates?

You did not push it.

Can I switch with unsaved edits?

Yes if they do not conflict; otherwise commit or stash.

What is a detached HEAD?

You are on a commit, not a branch. Make a branch with git switch -c to keep work.

How do I see the last commit on each branch?

git branch -v

How do I see branches that are not merged?

git branch --no-merged main

Interview questions

1. How do you create a branch and push it?

   git switch -c NAME, commit, git push -u origin NAME.

2. Difference between -d and -D?

   -d deletes only merged branches; -D forces.

3. How do you delete a remote branch?

   git push origin --delete NAME.

4. What is a remote-tracking branch?

   A local read-only copy like origin/main, updated by fetch.

5. What is detached HEAD?

   HEAD points to a commit directly; new commits are not on any branch until you create one.

Samajla ka?

Ravi Sir's Cards for this lesson

Revision cardInterview card

मराठी cards