Patents Assigned to HUAWEI CLOUD COMPUTING TECHNOLOGY CO., LTD.
  • Method and apparatus for merging a plurality of software code change versions
    Patent number: 12001838
    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.
    Type: Grant
    Filed: June 28, 2022
    Date of Patent: June 4, 2024
    Assignee: HUAWEI CLOUD COMPUTING TECHNOLOGY CO., LTD.
    Inventors: Zhao Wei, Guangtai Liang, Lin Li, Qianxiang Wang