Integrate flags can be applied when the Merge/Integrate and Branch
dialogs run the p4 integrate
command. You can
configure these integrate flags to be applied by default.
The following integration flags can have unexpected or undesired results. Do not select them if you are not certain you want these actions to be applied.
These integrate flags are applied with different P4 commands, depending on the dialog, integration method, and Helix Server (P4D) version:
Condition | Command | Available Flags | |
---|---|---|---|
Merge/Integrate |
Stream-to stream method |
|
None |
Merge/Integrate |
Branch mapping and Files and Folders methods |
|
All |
Copy |
Command available only with Helix Core Server 2011.1 and up |
|
|
Branch |
Helix Core Server 2010.2 and earlier |
|
|
Branch |
Helix Core Server 2011.1 and up |
|
None |
For more information about these P4 commands, see the P4 Command Reference.