Quiz: Merge Conflicts

Test what you learned in this lesson before moving on.

Pass with 80% to complete this lesson.

1. What do the conflict markers '<<<<<<< HEAD' and '>>>>>>> feature/x' indicate?

2. After resolving a conflict in a file, what must you do before committing?

3. What does 'git checkout --theirs src/user.js' do during a conflict?