Git Merge Conflict Resolution Mastery Quiz Quiz

1. Identifying a Merge Conflict

   When merging branches in Git, what sign in a file indicates that a merge conflict has occurred?

   1. u003Cu003Cu003Cu003Cu003Cu003Cu003C
   2. ///////
   3. =======u003Eu003C
   4. !!!!!!!
   5. u0026u0026u0026u0026u0026u0026u0026

2. Basic Merge Conflict Resolution Command

   Which Git command should you run after manually fixing merge conflicts to mark the conflicted files as resolved?

   1. git add
   2. git merge --abort
   3. git commit --fix
   4. git resolve
   5. git clear

3. Common Editor for Conflict Resolution

   Which command launches the default merge conflict editor set in Git to help you resolve conflicts?

   1. git mergetool
   2. git edittree
   3. git fix
   4. git editor --merge
   5. git resolve-editor

4. Aborting a Merge with Conflicts

   If you want to cancel an in-progress merge with conflicts and revert to the previous state, which command should you use?

   1. git merge --abort
   2. git merge --reset
   3. git cancel-merge
   4. git stop merge
   5. git revert-merge

5. Understanding HEAD in Conflict Markers

   In a conflict marker, what does the term 'HEAD' typically refer to?

   1. Your current branch before the merge
   2. The remote tracking branch
   3. The most recent commit on the other branch
   4. A detached commit pointer
   5. The first commit in the repository

6. Resolving All Conflicts Automatically

   Which command tries to automatically resolve as many conflicts as possible by favoring the changes from your branch and dismissing those from the merging branch?

   1. git merge -X ours
   2. git merge -X theirs
   3. git merge --favor-us
   4. git conflict-fix --auto
   5. git merge --ours-fix

7. Committing After Conflict Resolution

   After resolving all merge conflicts and staging the changes, which command completes the merge process?

   1. git commit
   2. git merge --continue
   3. git resolve --commit
   4. git commit --merge-finish
   5. git end-merge

8. What NOT to Do During Merge Conflict

   Which of the following should you avoid when resolving a merge conflict in Git?

   1. Deleting all conflict markers without choosing which changes to keep
   2. Using a merge tool
   3. Editing the file to select desired changes
   4. Running 'git add' after resolving
   5. Running 'git status' to check which files are conflicted

9. Checking for Remaining Conflicts

   What is the Git command to show files that still have unresolved merge conflicts?

   1. git status
   2. git log --conflicts
   3. git show-conflicts
   4. git diff-resolve
   5. git conflicts

10. Using Conflict Markers

    What are the three main conflict marker lines you find in a conflicted file after a merge in Git?

    1. u003Cu003Cu003Cu003Cu003Cu003Cu003C, =======, u003Eu003Eu003Eu003Eu003Eu003Eu003E
    2. u003Cu003Cu003Cu003Cu003Cu003C, ///////, u003Eu003Eu003Eu003Eu003Eu003E
    3. ---HEAD---, ---BASE---, ---END---
    4. u003Cu003Cu003CHEAD, ===, u003Eu003Eu003EMERGE
    5. ***START***, ***DIVIDER***, ***END***