A Method For Grouping And Sorting Java Conflict Files In Code Repository Based On Directed Graph

With the increasing application of Internet technology and the ever-changing changes in the software industry,there are more and more demands for remote collaborative work,the use of software code warehouses,and conflict resolution.Code merging also plays an important role in collaborative software development.In modern software development,developers rely on version control systems like Git to collaborate in branch-based development efforts.The number of conflicts that arise in large Java projects is high.However,manually resolving merge conflicts is often tedious and error-prone for developers.Failure to resolve them correctly reduces the efficiency of collaboration,especially during long merge lifecycles.When there are many conflicts in the branch or parallel version,due to the dependencies between files,developers randomly choose the resolution order when resolving conflicts,resulting in repeated modifications to the same conflict.In order to help developers resolve conflicts effectively and orderly,research on grouping and sorting conflicts is very necessary.Existing research includes improving text or unstructured merging tools,developing structured or semi-structured merging algorithms,designing automatic or semi-automatic conflict resolvers,and detecting and predicting conflicts before actual merging.In practice,it is generally believed that fully automatic conflict resolution Neither feasible nor safe,an important limitation of previous approaches to conflict resolution is that they do not fully exploit the interrelationships between conflicts.This thesis proposes a directed graph-based method for grouping and sorting Java conflict files in code warehouses.It mainly studies the conflicts of Java files.Using the interdependence between Java files,it will recommend a method to summarize related conflicts.The results of the same group and a conflict resolution order help developers reduce the probability of repeatedly modifying the same conflict,and make a prospect for future research on conflict file sorting in code warehouses.This thesis extracted 3184 conflicts in 11 Java project code repositories,and gave the sorting results for the Java conflicting files in each warehouse respectively.Each code repository is reduced by6.47%,which is 1.45% less duplicate modification than the initial sorting result given by the method proposed by Shen et al.