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.
¿WHEN DOES MERGE CONFLITCTS HAPPEN?
Conflicts happen when you’re merging two branches but you or somebody else has made changes to the same items in a file.