Interview Question 23

Conflict resolution.

Knowledge Check

23. How do you tell Git a conflicted file is resolved?