Associated conflict block presentation method and equipment

Abstract

The invention provides an associated conflict block presentation method and equipment. The method comprises the steps of acquiring a first conflict file, wherein the first conflict file comprises a plurality of code blocks, and each code block comprises a code fragment of a current version of the code block, a code fragment of a basic version of the code block and a code fragment of a to-be-mergedversion of the code block; receiving a first instruction which is triggered by a user interface and used for activating a to-be-processed code block, wherein the type of the to-be-processed code block is an unresolved conflict block or a unilateral change block; and presenting code fragments contained in the to-be-processed code block and indexes of N associated code blocks of the to-be-processedcode block on the user interface. Therefore, a user can quickly find the definition and the use condition of a variable and / or a function in the current conflict block. In addition, the resolution scheme of a code block which is similar to the current conflict block and has been resolved can be referred, and the conflict block resolution efficiency of the user is greatly improved.

Description

technical field [0001] The present application relates to the technical field of software development, in particular to a method and device for presenting associated conflict blocks. Background technique [0002] In the process of software development, when different project teams develop in parallel on the basis of the same version of code, after the development is completed, the codes developed by them need to be merged for reasons such as function merging. However, if different project teams make different changes to the same code entity in the base version during the development process, code conflicts will occur when merging. At present, many users use the SemanticMerge tool to automatically resolve conflicting blocks. However, this tool cannot completely resolve all conflicts generated during the code merging process. That is to say, the complete resolution of code conflicts still relies on manual participation. How to improve the efficiency of manual resolution? beco...

AI Technical Summary

Problems solved by technology

For example: the change information of the current version relative to the base version and the change information of the version to be merged relative to the base version, etc. When doing resolution, the user can use these insights to intuitively understand the code fragments of the three versions contained in the current conflict block. However, when users do resolution, they need to view the code fragments of the associated conflicting blocks more often. The above method only provides insight into the current conflicting block and cannot meet the user's needs for quickly locating the associated conflicting blocks.

Images