Assertion: revision control software | /r/HasProperty | resolved
Facets:
value: clearly
type: MANNER
Source sentences:
text: A user tries to check in files that have been updated by others since the files were checked out , and the revision control software automatically merges the files (typically, after prompting the user if it should proceed with the automatic merge, and in some cases only doing so if the merge can be clearly and reasonably resolved).