Assertion: automatic merging | /r/CapableOf | run into a change conflict
Facets:
Source sentences:
text: Manual merging is also required when automatic merging runs into a change conflict; for instance, very few automatic merge tools can merge two changes to the same line of code (say, one that changes a function name, and another that adds a comment).