AI and git conflict resolution coach

End-of-lesson check

15 questions · take it digitally for instant feedback at tendril.neural-forge.io/learn/quiz/end-creators-ai-coding-AI-and-git-conflict-resolution-coach-r9a1-creators

1. What is the primary limitation when you view only the <<<<<<<, =======, and >>>>>>> markers in a merge conflict?

   1. The markers indicate which branch came first chronologically
   2. Git automatically resolves all conflicts shown with these markers
   3. The markers are visible but don't reveal why each branch made its changes
   4. The conflict only appears in binary files, not text

2. When AI analyzes both sides of a merge conflict, what is it attempting to infer?

   1. The exact line numbers where conflicts will occur
   2. The username and email of who made each change
   3. The intent or purpose behind each branch's changes
   4. The timestamp when each change was committed

3. Which task can AI reliably perform when you paste a merge conflict block?

   1. Automatically run your test suite to verify the merge
   2. Access your full git history without you pasting it
   3. Commit the resolved merge to your repository
   4. Explain what each branch likely tried to change based on the code context

4. Why might AI sometimes incorrectly suggest keeping both sides of a conflicting change?

   1. The conflict markers tell AI exactly which change is correct
   2. AI cannot verify if the two changes actually contradict each other semantically
   3. AI has access to your team's coding standards document
   4. AI always detects semantic contradictions in the code

5. In merge conflict terminology, what does 'intent' refer to?

   1. The order of commits in the branch history
   2. The file path where the conflict occurred
   3. The exact text string that was modified
   4. The goal or purpose behind a particular code change

6. If AI explains that one branch added a new function while another renamed a variable used by that function, what should guide your resolution?

   1. The number of commits in each branch
   2. Whether the renamed variable will break the new function after merging
   3. Which branch was created more recently
   4. The length of the code in each side

7. What can AI see about your repository when you paste only the conflict markers?

   1. The contents of all other files in your repository
   2. Your entire commit history and branch structure
   3. Only the conflict block and whatever context you provide
   4. Your team's pull request comments

8. When should you avoid blindly accepting AI's suggested merged version?

   1. When the conflict uses standard <<<<<<< markers
   2. When AI correctly identifies the file names involved
   3. When the merge uses a three-way merge algorithm
   4. When the suggestion keeps both sides but they may actually contradict each other

9. What is a 'semantic' conflict in merge terminology?

   1. A conflict that only occurs in compiled languages
   2. A conflict between two variable names that sound similar
   3. A conflict where the code compiles but produces incorrect behavior
   4. A conflict that git's three-way merge algorithm cannot detect

10. Why must a human ultimately decide which branch's intent should 'win' in a merge?

    1. AI always chooses the objectively correct solution
    2. Git requires a human signature to validate merges
    3. Only your team knows the relative priority of competing features or fixes
    4. Code with more lines is always correct

11. What does the three-way merge algorithm use to detect conflicts?

    1. The commit messages from each branch
    2. The number of files changed in each branch
    3. The timestamp of each commit
    4. The common ancestor version and both branch versions

12. If you paste a conflict block without any commit history, what is AI's main limitation?

    1. AI will guess random commit messages
    2. AI cannot see the context of why those changes were made
    3. AI will refuse to analyze the conflict
    4. Git automatically includes history with every conflict block

13. Which of the following is an example of what AI does well when analyzing merge conflicts?

    1. Automatically committing the resolved merge
    2. Accessing your team's project management board
    3. Running the test suite to verify the merge works
    4. Suggesting a merged version that preserves both branches' changes

14. After AI proposes keeping both sides of a conflict, what should you verify before accepting?

    1. Whether the file is in the correct directory
    2. Whether git status shows no other conflicts
    3. Whether the conflict used proper marker formatting
    4. Whether the two changes actually work together logically

15. What typically causes a merge conflict to appear in git?

    1. When a file was deleted in one branch
    2. When a commit message contains a typo
    3. When the same line or adjacent lines were modified differently in two branches
    4. When the repository has more than three branches