Digraph-based code repository Java conflict file sorting and grouping method

Abstract

The invention discloses a directed graph-based code repository Java conflict file sorting and grouping method. The method comprises the following steps of: firstly, constructing a dependency graph for all Java files on different branches according to a dependency relationship among the files; secondly, combining the graphs on different branches to obtain a combined dependency graph; then, traversing the merged dependency graph, comparing file full path names carried by the nodes with full path names of the Java files with conflicts, and storing the full path names of the Java files with the same comparison according to the sequence numbers of the nodes from large to small; then, dividing the Java files in the same dependency graph into the same group; according to the method, a large number of conflicts existing in the current code warehouse can be effectively sorted, and meanwhile, the conflicted files are effectively grouped, so that developers are helped to solve the conflicts in order.

Description

technical field [0001] The invention relates to the field of computer technology, in particular to a method for sorting and grouping conflicting files in a code warehouse Java based on a directed graph. Background technique [0002] In modern software development, developers rely on version control systems like Git to collaborate on branch-based development efforts. A disadvantage of this working model is that when merging contributions from different developers, conflicts can arise, reducing the efficiency of collaboration and introducing potential vulnerabilities, as refactoring has become prevalent in software development and development, and The situation gets worse with a higher number of conflicts. [0003] However, a common problem with conflicting merges is that for an unstructured merge, which treats the code as plain text, a conflict is reported whenever a developer modifies the same line of code, and this situation exists High number of false positives; for stru...

AI Technical Summary

Problems solved by technology

A disadvantage of this mode of working is that when contributions from different developers are merged, conflicts arise, reducing the efficiency of collaboration and introducing potential vulnerabilities. As refactoring becomes prevalent in software development and evolution, and The situation gets worse with a higher number of conflicts

[0003] However, a common problem with conflicting merges is that for unstructured merges, which treat the code as plain text, conflicts will be reported whenever a developer modifies the same line of code. Higher number of false positives; for structured merges it reduces some false positives

[0005] In the published document CN201910904927-an AST-based relational database SQL table relationship analysis and display method and document CN201210219285-a random test case generation method for Java programs, although it also has the idea of ​​​​dependency analysis and sorting, However, when sorting, the nodes are not sorted, and it is easy to make repeated modifications during subsequent processing, which affects the efficiency of the solution process

Images