PhpStorm 6.0.1 Web Help

Unshelving is moving postponed changes from a shelf to a pending changelist.

With PhpStorm, you can unshelve both entire shelves and separate files.

Unshelved changes can be filtered out from the view or removed from the shelf. Once shelved, a change can be applied as many times as you need by unshelving and subsequently restoring it on the shelf.

To unshelve changes
  1. In the Shelf tab of the Changes tool window, select the files or a whole shelf to unshelve.
  2. On the context menu of the selection, choose Unshelve Changes.

    img

  3. 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.
  4. Click OK.
  5. If the conflicts occur between the patched version and the current version, resolve them as described in the section Resolving Conflicts:

    ws_ps_unshelving_resolve.png
    Click thumbnail to view larger image.

  6. Select the changes in both versions to be merged to the resulting file and click Apply.

See Also

Concepts:

Procedures:

Reference:

Web Resources: