- In the Shelf tab of the Changes tool window, select the files or a whole shelf to unshelve.
- On the context menu of the selection, choose
- In the Unshelve Changes to Changelist dialog box box that opens, specify the changelist you want to add the unshelved changes to. Select one of the existing changelists, or create a new one.
- Click OK.
- If the conflicts occur between the patched version and the current version, resolve them as described
in the section Resolving Conflicts:
- Select the changes in both versions to be merged to the resulting file and click Apply.