Git Merge Conflict Resolution Quiz Quiz

1. What is a merge conflict?

   What is a merge conflict in Git?

   1. A situation where Git automatically combines changes from two branches.
   2. A situation where Git cannot automatically combine changes from two branches.
   3. When two developers are working on totally different projects.
   4. A common type of error when attempting to create a new branch.
   5. A process for automatically deploying websites

2. Common Cause of Merge Conflicts

   Which scenario is the most common cause of merge conflicts?

   1. Deleting a branch.
   2. Two contributors make changes to the same part of a file on different branches.
   3. Creating a new repository.
   4. Pushing directly to the main branch.
   5. Using different versions of Git.

3. Identifying Conflicts Locally

   What Git command helps identify conflicting files in your local repository?

   1. git status
   2. git conflict
   3. git log
   4. git diff
   5. git check

4. Conflict Markers

   What special markers enclose the conflicting sections in a file?

   1. u003Cu003Cu003Cu003Cu003Cu003Cu003C HEAD, =======, u003Eu003Eu003Eu003Eu003Eu003Eu003E branch-name
   2. HEAD, EQUAL, BRANCH
   3. BEGIN, MIDDLE, END
   4. START, CONFLICT, FINISH
   5. CONFSTART, CONFEND, CONFMID

5. Resolving Conflicts in Binary Files

   How are merge conflicts typically resolved in binary files?

   1. By manually editing the binary code.
   2. By selecting which version of the file to keep.
   3. By automatically merging the files using Git.
   4. By converting the binary file to text.
   5. Git can automatically merge binary files with no problems

6. Staging Resolved Conflicts

   After resolving a merge conflict in a file, what command stages the file?

   1. git commit u003Cfile-nameu003E
   2. git resolve u003Cfile-nameu003E
   3. git add u003Cfile-nameu003E
   4. git merge u003Cfile-nameu003E
   5. git push u003Cfile-nameu003E

7. Independent Branch Evolution

   Why does independent branch evolution often lead to merge conflicts?

   1. Because the branches have been configured incorrectly.
   2. Because the differences accumulate over time, making automatic merging difficult.
   3. Because Git automatically creates conflicts for long-lived branches.
   4. Because it causes changes to be automatically discarded.
   5. Because the code becomes easier to merge.

8. Pull Request Conflicts on GitHub

   Where on GitHub can you identify merge conflicts within a pull request?

   1. In the 'Issues' tab.
   2. Near the top of the PR interface, with a message indicating conflicts.
   3. In the 'Settings' tab of the repository.
   4. In the comments section of the pull request.
   5. In the 'Actions' tab.

9. Consequences of Ignoring Conflicts

   What is the primary risk if merge conflicts are ignored or not resolved correctly?

   1. The repository will be automatically deleted.
   2. The code quality may be compromised, leading to bugs or regressions.
   3. Git will automatically fix the problems.
   4. The affected files will be locked and inaccessible.
   5. The build process will slow down significantly.

10. Communication in Conflict Prevention

    How does effective communication among team members help in preventing merge conflicts?

    1. By automatically resolving all potential conflicts.
    2. By ensuring everyone is aware of planned changes and coordinating efforts.
    3. By eliminating the need for branching strategies.
    4. Communication is not important for preventing merge conflicts.
    5. By allowing only one person to modify each file.