Assertion: conflict | /r/CapableOf | highlight conflicted area
Facets:
Source sentences:
text: If Git detects a conflict, it will highlight the conflicted area and ask which code you wish to keep.