Method for presenting associated conflict block and device

A terminal device comprising:

• a memory configured to store program instructions;
• and
• a processor coupled to the memory and configured to execute the program instructions to cause the terminal device to:
• obtain 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;
• receive, from a user interface, a first instruction for activating a to-be-processed code block, wherein a first type of the to-be-processed code block is of an unresolved conflict block or a single-side change block;
• present, on the user interface in response to the first instruction, 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, wherein a second type of each of the N associated code blocks is one of the unresolved conflict block, the single-side change block, or a resolved conflict block, wherein an association relationship between each of the N associated code blocks and the to-be-processed code block is one of a dependency relationship, a depended relationship, or a similarity relationship, and wherein N is greater than or equal to 1;
• receive, from the user interface, a second instruction for activating one of the N associated code blocks by clicking an index of the N associated code blocks;
• and
• switch the user interface from presenting the fourth code snippet to presenting a fifth code snippet comprised in the one of the N associated code blocks.

A computer program product comprising computer-executable instructions that are stored on a non-transitory computer-readable medium and that, when executed by a processor, cause an apparatus to:

• obtain 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;
• receive, from a user interface, a first instruction for activating a to-be-processed code block, wherein a first type of the to-be-processed code block is of an unresolved conflict block or a single-side change block;
• present, on the user interface and in response to the first instruction, 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, wherein a second type of each of the N associated code blocks is one of the unresolved conflict block, the single-side change block, or a resolved conflict block, wherein an association relationship between each of the N associated code blocks and the to-be-processed code block is one of a dependency relationship, a depended relationship, or a similarity relationship, and wherein N is greater than or equal to 1;
• receive, from the user interface, a second instruction for activating one of the N associated code blocks by clicking an index of the N associated code blocks;
• and
• switch the user interface from presenting the fourth code snippet to presenting a fifth code snippet comprised in the one of the N associated code blocks.