Assertion: revision control software | /r/CapableOf | merge file
Facets:
value: after prompting the user
type: TEMPORAL
value: automatically
type: MANNER
value: typically
type: DEGREE
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).