Brainscape's Knowledge GenomeTM

Browse over 1 million classes created by top students, professors, publishers, and experts.


See full index

Learning Git and Github > 8. MERGE CONFLICTS > Flashcards

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

Learning Git and Github (9 decks)

Brainscape helps you reach your goals faster, through stronger study habits.
© 2025 Bold Learning Solutions. Terms and Conditions