Integrate File dialog (Perforce)
Install the Perforce plugin
This functionality relies on the Perforce plugin, which you need to install and enable.
Press Ctrl+Alt+S to open settings and then select .
Open the Marketplace tab, find the Perforce plugin, and click Install (restart the IDE if prompted).
Use this dialog to integrate changelists from one branch spec to another.
Item | Description |
|---|---|
Branch Spec | Select the branch spec that will be used for change integration. Consider the following:
|
Integrate changelist | Use this option to invoke the Changes Browser, where you can select the changelist that will be integrated into the current branch/local copy. |
Store Changes To Changelist | Specify the changelist where the integrated changes should be stored. |
Revert unchanged files before sync (p4 revert -a) | Select this option to revert unchanged files. |
Run resolve automatically after the sync (p4 resolve -am) | Select this option to automatically resolve the files that can be resolved without conflicts. |