Invention Grant
- Patent Title: Code conflict resolution system and method, apparatus, device, and medium
-
Application No.: US17722897Application Date: 2022-04-18
-
Publication No.: US11960879B2Publication Date: 2024-04-16
- Inventor: Guangtai Liang , Zhao Wei , Lin Li , Anqi Yu , Shanbin Cheng , Qianxiang Wang
- Applicant: Huawei Cloud Computing Technologies Co., Ltd.
- Applicant Address: CN Guizhou
- Assignee: HUAWEI CLOUD COMPUTING TECHNOLOGIES CO., LTD.
- Current Assignee: HUAWEI CLOUD COMPUTING TECHNOLOGIES CO., LTD.
- Current Assignee Address: CN Guizhou
- Agency: Conley Rose, P.C.
- Priority: CN 1910996009.5 2019.10.18 CN 1911274195.8 2019.12.12
- Main IPC: G06F9/44
- IPC: G06F9/44 ; G06F8/71 ; G06F8/73

Abstract:
A local apparatus is configured to perform resolution on a conflict field generated by code files of a plurality of versions, and send a conflict resolution result to the service apparatus. The conflict field includes at least one conflict block, and the conflict resolution result includes at least one of a resolution result of a local resolvable conflict block and an identifier of a local irresolvable conflict block. The remote apparatus is configured to obtain the conflict resolution result from the service apparatus, generate a collaborative processing window based on the conflict resolution result, and receive a result of processing the conflict resolution result by a remote user based on the collaborative processing window.
Public/Granted literature
- US20220236981A1 Code Conflict Resolution System and Method, Apparatus, Device, and Medium Public/Granted day:2022-07-28
Information query