Steps to reproduce:

1. Change your Shelve & Switch settings to one of the "Allow" settings (e.g., Allow or Allow, showing a warning).
2. Create a branch from your main branch.
3. Make changes to an existing file in your workspace.
4. Manually create a shelf from your pending changes, making sure to select the option to keep them in pending changes.
5. Attempt to switch back to the main branch.

Actual results:

The following error message is displayed:

"Cannot perform the switch to branch/label/changeset/shelve since there are pending changes. Please review the pending changes and retry the operation again."

Expected results:

A more concise error message that still differentiates the file state, like the following, should be displayed:

"Cannot perform the switch because there are explicitly checked-out files in your workspace. Please review your checked-out files, undo the checkouts, and retry the operation."
*

Reproducible with versions:*

11.0.16.9973

Tested on (OS):

Windows