The patent badge is an abbreviated version of the USPTO patent document. The patent badge does contain a link to the full patent document.
The patent badge is an abbreviated version of the USPTO patent document. The patent badge covers the following: Patent number, Date patent was issued, Date patent was filed, Title of the patent, Applicant, Inventor, Assignee, Attorney firm, Primary examiner, Assistant examiner, CPCs, and Abstract. The patent badge does contain a link to the full patent document (in Adobe Acrobat format, aka pdf). To download or print any patent click here.
Patent No.:
Date of Patent:
Apr. 16, 2024
Filed:
Apr. 18, 2022
Huawei Cloud Computing Technologies Co., Ltd., Guizhou, CN;
Guangtai Liang, Beijing, CN;
Zhao Wei, Gui'an, CN;
Lin Li, Beijing, CN;
Anqi Yu, Hangzhou, CN;
Shanbin Cheng, Beijing, CN;
Qianxiang Wang, Beijing, CN;
HUAWEI CLOUD COMPUTING TECHNOLOGIES CO., LTD., Guizhou, CN;
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.