Course (Part 548)

Course: Intermediate Git

Lesson

Topic: Working with Branches — Introduction to Branches

Learning Outcomes

• Understand what a branch is and why branches are used in Git.
• Create, switch, list, merge, rename, and delete branches using command-line Git.
• Recognize merge types and resolve simple merge conflicts.
• Apply best practices for branch naming, scope, and remote collaboration.

Conceptual Explanation

A branch is a movable pointer to a commit that represents an independent line of development. Branching isolates work (features, bugfixes, experiments) from the main codebase; merging integrates those changes back. Typical flow: create a branch, switch to it, make commits, keep it up to date with main, open a pull request or merge locally, resolve conflicts if any, then delete the branch when done. Use short-lived, focused branches and descriptive names (e.g., feature/login, bugfix/issue-123).

git branch <branch-name>

git checkout -b <branch-name>

git checkout <branch-name>

git branch
git branch -a

git checkout main
git merge <branch-name>

git branch -d <branch-name>
git branch -D <branch-name> (force)

git branch -m <old> <new>
git branch -m <new> (if on branch)

git branch | wc -l
git branch -r | wc -l

Bilingual (EN → বাংলা)

Important Notes

• Always check your current branch with git branch before making changes.
• Pull or merge from main into your feature branch frequently to reduce conflicts.
• Use remote pushes (git push origin <branch>) and set upstream (--set-upstream) for collaboration.
• Communicate renames and deletions with your team to avoid breaking workflows.

Exercises

True / False

1. Creating a branch copies files to a new directory.
   Answer

   False — creating a branch creates a pointer to a commit; files are not duplicated on disk until changes are made in the working tree.
2. A fast-forward merge creates a new merge commit.
   Answer

   False — fast-forward moves the branch pointer and does not create a merge commit.
3. You must delete a branch before merging it.
   Answer

   False — deletion is optional and typically done after successful merge.

Fill in the Blanks

1. To create and switch to a branch in one command:
   Answer

   git checkout -b <branch-name>

2. To see all remote branches use:
   Answer

   git branch -r

3. To force-delete a local branch:
   Answer

   git branch -D <branch-name>

Multiple Choice (MCQ)

1. Which command sets the upstream for a renamed local branch?
   • a) git push origin --delete <old>
   • b) git push --set-upstream origin <new>
   • c) git branch -m <old> <new>
   Answer

   b) git push --set-upstream origin <new>
2. Which strategy is recommended to minimize merge conflicts?
   • a) Work in a single long-lived branch for everything
   • b) Regularly merge main into feature branches
   • c) Never pull from remote
   Answer

   b) Regularly merge main into feature branches

Matching

Match the command (A–E) with its effect (1–5):

git branch -d feature

git push origin --delete feature

git checkout -b feature

git branch -a

git branch -m old new

Descriptive

Explain the difference between a fast-forward merge and a three-way merge.

Creative

Design a brief branching policy for a small team (3–6 developers) using feature branches and pull requests.

Activities, Vocabulary, Homework, Practice Task

Activities

1. Pair exercise: create a feature branch, implement a small change, push it, and make a pull request.
   Answer

   Partners should confirm branch creation (git checkout -b), push (git push -u origin <branch>), and open a PR on the remote platform.
2. Conflict simulation: both students edit same line, then merge and resolve.
   Answer

   One student merges the other's branch and resolves the conflict markers, stages, and commits the resolution.

Vocabulary

Homework

1. Read the team's chosen branching strategy (Git Flow / Trunk-Based) and write 200 words on when you'd prefer one over the other.
   Answer

   Submit the write-up with examples: Git Flow for scheduled releases, Trunk-Based for continuous delivery.
2. Create 3 branches locally, make commits on each, merge them into main and document commands used.
   Answer

   Provide a short transcript of commands and outcomes (include any conflict resolutions).

Practice Task

Using a sample repo, demonstrate: clone → create branch → commit change → push → open PR → merge → delete branch. Record commands and results.

git clone https://github.com/you/sample.git
cd sample
git checkout -b feature/example
# edit files
git add .
git commit -m "Add example"
git push -u origin feature/example
# open PR on GitHub, approve & merge
git checkout main
git pull origin main
git branch -d feature/example
git push origin --delete feature/example

Next lesson: Resolving merge conflicts and advanced merge strategies.