Why branches are essential in Git - Challenge Your Understanding

Challenge - 5 Problems

🧠 Conceptual

intermediate

Why use branches in Git?

Why are branches important when working with Git?

A They allow multiple people to work on different features without affecting the main code.

B They automatically fix merge conflicts without user input.

C They delete the main code to create a new project.

D They prevent any changes from being saved in the repository.

💡 Hint

Think about how teams work on different tasks at the same time.

Branches let developers work on separate features or fixes independently. This keeps the main code stable and avoids conflicts until changes are ready to merge.

💻 Command Output

intermediate

Output of creating and switching branches

What is the output of running these commands in order?

git branch feature1
git checkout feature1
git branch

A

* feature1
  main

B

  feature1
* main

C error: branch 'feature1' already exists

D

* main
  feature1

💡 Hint

The asterisk (*) shows the current branch.

After creating and switching to 'feature1', the current branch is 'feature1'. The 'git branch' command lists branches with '*' marking the active one.

🔀 Workflow

advanced

Correct order to create and merge a feature branch

What is the correct order of commands to create a feature branch, work on it, and merge it back to main?

A 2,3,1,4,5

B 1,2,3,4,5

C 1,4,2,3,5

D 4,1,2,3,5

💡 Hint

Create branch first, then add and commit changes, switch back to main, then merge.

You first create and switch to the feature branch, add and commit your changes there, then switch back to main and merge the feature branch.

❓ Troubleshoot

advanced

Resolving a merge conflict

You try to merge a feature branch into main but get a conflict. What should you do next?

A Push the feature branch without resolving conflicts.

B Delete the main branch and recreate it.

C Run 'git merge --abort' and ignore the conflict.

D Open the conflicting files, fix the conflicts manually, then add and commit the changes.

💡 Hint

Conflicts need manual fixing before completing the merge.

When a merge conflict happens, you must open the files, fix the conflicting parts, then stage and commit the resolved files to complete the merge.

✅ Best Practice

expert

Why keep branches short-lived?

Why is it best practice to keep feature branches short-lived in Git?

A Short-lived branches make the repository size smaller.

B Short-lived branches automatically delete themselves after one day.

C Short-lived branches reduce merge conflicts and keep the project organized.

D Short-lived branches prevent anyone else from pushing code.

💡 Hint

Think about how long branches stay separate and how that affects merging.

Keeping branches short-lived means changes are merged back quickly, reducing the chance of conflicts and keeping the project clean and easier to manage.