Assertion: merge conflict | /r/CapableOf | merge branch
Facets:
Source sentences:
text: Merge conflicts can happen when merging a branch, rebasing a branch, or cherry picking a commit.