Huawei Cloud Computing Technologies Co., Ltd.

Zhao Wei

Lin Li

Guangtai Liang

Qianxiang Wang

Shanbin Cheng

Xiao Cheng

Zeyu Wang

Anqi Yu

Tianyong Wu

In a software code change method, an apparatus determines to-be-changed software code and change configuration information according to an instruction of a user. The apparatus selects, from stored changers based on the change configuration information, a plurality of changers to be called to implement changes to the software code, and determines a calling sequence of the plurality of changers and sets attributes of each changer. The apparatus then sequentially calls the plurality of changers according to the calling sequence and based on the attributes of each changer to make changes to the software code.

Software code change method and apparatus

A method for presenting an associated conflict block comprises obtaining a first conflict file comprising a plurality of first code blocks, wherein a second code block of the first code blocks comprises a first code snippet of a current version of the second code block, a second code snippet of a basic version of the second code block, and a third code snippet of a to-be-merged version of the second code block. A first instruction triggered on a user interface for activating a to-be-processed code block is received, wherein a first type of the to-be-processed code block is of an unresolved conflict block or a single-side change block. A fourth code snippet comprised in the to-be-processed code block and indexes of N associated code blocks of the to-be-processed code block is presented on the user interface.

Method for presenting associated conflict block and device

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.

Method and apparatus for merging a plurality of software code change versions

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.

Growing community of inventors

Gui'an, China

Zhao Wei