Application development - Event
Merge conflict
When changes from different branches affect the same code and cannot be combined automatically
What's it for?
Shows when two software changes overlap in a way that needs a person to decide how they should be combined.
For example…
Two developers change the same line differently, so Git reports a merge conflict and someone must decide which version the final code should contain
A merge conflict also occurs when one branch deletes a file that another branch has edited, requiring a human decision before merging
Think of it like…
Two musicians record different bass lines for the same part of a song, so you have to decide which one to use