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.

Abstract: In a code analysis method, a code analysis system obtains information about a service scenario that represents an objective of code analysis. The code analysis system generates a code analysis algorithm for the service scenario based on the information about the service scenario. When code analysis needs to be performed, the code analysis system obtains information about source code and object code that are specified by a user, and analyzes similarity between the source code and the object code according to the code analysis algorithm to obtain an analysis result. The similarity between the source code and the object code is analyzed according to the code analysis algorithm generated based on the information about the service scenario, to obtain the analysis result that meets a requirement of the service scenario.

Abstract: 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.

Abstract: This application provides a code conflict resolution system, including a local apparatus, a service apparatus, and a remote apparatus. The 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, so as to improve conflict resolution quality and conflict resolution efficiency.