Practice & Assessment
Test your understanding of Branching, Merging, and Resolving Conflicts
Multiple Choice Questions
6What does HEAD point to in Git?
Which command creates a new branch and switches to it immediately?
When does a fast-forward merge occur?
What is the golden rule of rebasing?
How do you abort a merge that is in progress and has conflicts?
What does interactive rebase (git rebase -i) allow you to do?
Mini Project
Blog Website Feature Branching Simulation
Set up a repository for a simple blog website. Create and work on three concurrent feature branches: feature/homepage, feature/about-page, and feature/contact-form. Each branch should have at least two commits. Merge them into main one by one, using --no-ff to preserve branch history. Use interactive rebase to squash the commits on one branch before merging. Document your branching strategy in a CONTRIBUTING.md file.