IntelliJ IDEA 13.1 Web Help

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

With IntelliJ IDEA, 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.

You can also import patches created inside or outside IntelliJ IDEA and apply them as shelved changes.

On this page:

Unshelving changes from an entire shelf
  1. In the Shelf tab of the Changes tool window, select the shelved changelist to unshelve.
  2. On the context menu of the selection, choose Unshelve Changes.
  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.
Unshelving specific 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.
  3. In the Unshelve Changes dialog box box that opens, specify the changes to unshelve by selecting the check boxes next to the relevant items.
  4. Specify the changelist to add the unshelved changes to. Select one of the existing changelists, or create a new one.
  5. Click OK.
  6. 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.

  7. Select the changes in both versions to be merged to the resulting file and click Apply.
Applying external patches

You can also import patches created inside or outside IntelliJ IDEA and apply them as shelved changes.

  • In the Shelf tab of the Changes tool window, choose Import Patches on the context menu. In the dialog box that opens, select the patch file to apply. The selected patch appears in the Shelf tab as a shelf. Select the newly added shelf with the patch and choose Unshelve Changes on the context menu of the selection.

See Also

Concepts:

Procedures:

Reference:

Web Resources: