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:
Jun. 04, 2024
Filed:
Jun. 28, 2022
Applicant:
Huawei Cloud Computing Technologies Co., Ltd., Guizhou, CN;
Inventors:
Zhao Wei, Gui'an, CN;
Guangtai Liang, Beijing, CN;
Lin Li, Beijing, CN;
Qianxiang Wang, Beijing, CN;
Assignee:
HUAWEI CLOUD COMPUTING TECHNOLOGY CO., LTD., Guizhou, CN;
Attorney:
Primary Examiner:
Int. Cl.
CPC ...
G06F 8/71 (2018.01); G06F 11/36 (2006.01);
U.S. Cl.
CPC ...
G06F 8/71 (2013.01); G06F 11/3604 (2013.01);
Abstract
A method for merging a plurality of software code change versions, where a merging apparatus may first analyze code change areas in a software code preliminarily merged version and two different software code change versions. After change intents of the two code change areas are determined, the merging apparatus eliminates, based on a conflict elimination rule set and the change intents of the two code change areas, a conflict block in the software code preliminarily merged version.