Association Conflict Block Presentation Method and Apparatus

Abstract

The present application provides a method and device for presenting associated conflicting blocks. The method includes: obtaining a first conflict file, the first conflict file includes a plurality of code blocks, each code block includes a code segment of the current version of the code block, a code segment of the basic version of the code block, and the The code fragment of the version of the code block to be merged; receiving the first instruction triggered by the user interface for activating the code block to be processed, the type of the code block to be processed is an unresolved conflict block or a unilaterally changed block; presented on the user interface The code fragment contained in the code block to be processed and the indexes of the N associated code blocks of the code block to be processed; so that the user can quickly find the definition and usage of variables and / or functions in the current conflicting block, and can also Refer to the resolution scheme of the code block that is similar to the current conflict block and has been resolved, which greatly improves the efficiency of the user to resolve the conflict block.

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