8. MERGE CONFLICTS

Question 1

¿WHEN DOES MERGE CONFLITCTS HAPPEN?

Answer 1

Conflicts happen when you’re merging two branches but you or somebody else has made changes to the same items in a file.