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.
【推荐】编程新体验,更懂你的AI,立即体验豆包MarsCode编程助手
【推荐】凌霞软件回馈社区,博客园 & 1Panel & Halo 联合会员上线
【推荐】抖音旗下AI助手豆包,你的智能百科全书,全免费不限次数
【推荐】轻量又高性能的 SSH 工具 IShell:AI 加持,快人一步