Perforce Integration Knowledge
1. Integration from branch to branch based on a specific CL or label.
It means to integrate the CLs between the last CL from src branch on desti branch and the specific CL or label into desti branch. The integration code changes should only reflect those CLs code changes.
2. Integration a CL
It means to integrate the CL's code change only into desti branch. The integration code changes should only reflect the only CL's code changes.
3. Notes
a. Branch means add, integrate means edit.
b. For those identical files after integration resolving, we need to keep them in the to-be-submitted CL. Although there is no code change, it does build branch relationship to that file and should save the latter integration effort to that file by the integration file version.
It means to integrate the CLs between the last CL from src branch on desti branch and the specific CL or label into desti branch. The integration code changes should only reflect those CLs code changes.
2. Integration a CL
It means to integrate the CL's code change only into desti branch. The integration code changes should only reflect the only CL's code changes.
3. Notes
a. Branch means add, integrate means edit.
b. For those identical files after integration resolving, we need to keep them in the to-be-submitted CL. Although there is no code change, it does build branch relationship to that file and should save the latter integration effort to that file by the integration file version.
