8. MERGE CONFLICTS Flashcards

1
Q

¿WHEN DOES MERGE CONFLITCTS HAPPEN?

A

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

How well did you know this?
1
Not at all
2
3
4
5
Perfectly