Assertion: merge conflict | /r/HasProperty | event
Facets:
Source sentences:
text: A merge conflict is an event that occurs when Git is unable to automatically resolve differences in code between two commits.