Shelve Changes dialog
Use this dialog to shelve the selected files or changelists.
Modified files pane
This section contains a list of files that have been modified since the last commit. All files in the list are selected by default. Deselect the files that you do not want to shelve.
The summary under the modified files pane shows statistics on the currently selected changelist, such as the number of modified, new and deleted files. This area also shows how many files of each type are shown, and how many of them will be shelved.
Commit Message pane
In this area, enter a string that will be used as the shelf name. When you unshelve your changes, a new changelist with the same name will be created in the Local Changes view. If you leave this field empty, the shelf name will be generated using the following pattern: <number of files in the shelf>, <date and time when the shelf was created>:
After Submit / After Commit section
Use the controls in this area to define which additional actions you want PhpStorm to perform after committing the selected files.
|Run tool||From this list, select the external tool that you want PhpStorm to launch after the selected changes have been committed. You can select a tool from the list, or click the Browse button and configure an external tool in the External Tools dialog that opens.||All VCSs|
|Upload files to|
The list is only available if the FTP/SFTP Connectivity plugin is enabled.
|Always use selected server or group of servers|
The checkbox is only available if the FTP/SFTP Connectivity plugin is enabled.
The Diff pane is hidden by default. To unfold it, click the arrow button next to the pane title.
In this pane you can explore the differences between the base repository version of the selected file, and the version you are about to commit.
Diff pane toolbar
|Item||Tooltip and Shortcut||Description|
|/||Previous Difference / Next Difference Shift+F7 F7|
Jump to the next or previous difference.
When the last or the first difference is reached, PhpStorm suggests clicking the arrow buttons or pressing F7/ Shift+F7 once more and comparing other files modified locally. This behavior depends on the Go to the next file after reaching last change option in the Differences Viewer settings.
This behavior is supported only when the Differences Viewer is invoked from the Commit tool window Alt+0.
Jump to SourceF4
|Open the selected file in the editor. The caret is placed in the same position as in the Differences Viewer.|
Compare Previous/Next File
Click these buttons to compare the local copy of the previous/next file with its update from the server.
Select a viewer mode: side-by-side or unified. The side-by-side mode has two panels, the unified mode has one panel.
You can edit code and perform the Apply, Append, Revert actions in both viewers.
You can change text only in the right-hand part of the side-by-side viewer, or in the lower line in the unified viewer.
You can edit only local versions of your files. You cannot edit files that have read-only status.
Define how the differences viewer should treat whitespaces.
Select the way differences granularity is highlighted.
The available options are:
|Collapse unchanged fragments||Collapse all the unchanged fragments in both files. The amount of non-collapsible unchanged lines is configurable in the Diff & Merge settings page. To open the Diff & Merge page, open settings by pressing Ctrl+Alt+S and navigate to .|
|Synchronize scrolling||Scroll both differences panes simultaneously. If this button is released, each pane can be scrolled independently.|
|Disable editing||Enable editing of the local copy of the selected file, which is disabled by default. When editing is enabled, you can make last-minute changes to the modified file before committing it.|
|Editor settings||Open a list of available options. Select or clear these options to show or hide line numbers, indentation guides, white spaces, and soft wraps.|
|Open a browser and show the corresponding help page.|
Note that the options listed above are available for text files only. PhpStorm cannot compare binary files, so most commands will be unavailable for them.