quiz

Conflict Resolution

Question 1 of 6Score: 0/6

What do the conflict markers <<<<<<< HEAD and >>>>>>> branch-name indicate?