s The item changed on disk and has also been modified in an editor. You must select which version to keep. If you select ...

%s

The item changed on disk and has also been modified in an editor. You must select which version to keep. If you select the 'Reload and lose local changes' button, you will lose your changes. If this file was checked out when disconnected, you may need to merge without using your source control system. If you click the 'Keep local changes' button you can use the 'Get Latest Version' command to merge your changes with the server version.