Quiz

Test your knowledge with the following questions:

1. What is a merge conflict in GitHub?
   1. An error during file download
   2. A disagreement between team members
   3. Overlapping changes made to the same part of a file
   4. A problem with internet connectivity

   Answer: C. Overlapping changes made to the same part of a file

2. Merge conflicts occur only when two people change the same line in a file.
   1. True
   2. False

   Answer: B. False (they can also occur with file deletions, renaming, and so on)

3. In GitHub, you can’t use the _______ to manually resolve merge conflicts.

   Answer: command line

4. Why is it important to resolve merge conflicts in a project?

   Answer: To ensure that the project has a coherent and functioning code base, reflecting the intended changes from all contributors.

5. What does the git merge command do?
   1. Deletes a branch
   2. Combines changes from different branches
   3. Changes the project name
   4. Creates a new file

   Answer: B. Combines changes from different branches

6. Merge conflicts are always...