Synchronization method and device for automatically identifying synchronization conflicts and solving conflicts

Abstract

The invention provides a synchronization method and device for automatically identifying synchronization conflicts and solving the conflicts, which can be applied to the field of finance. The method comprises the following steps: monitoring conflict files generated in codes to be synchronized in real time, analyzing various states of the conflict files in real time in a code synchronization process, automatically matching a method model for solving a conflict problem according to the state of each conflict file, and if the conflict state is an unknown conflict state, adaptively generating a conflict solution for the conflict by using a pre-established conflict problem solving method model, adding the newly generated conflict solution into the method model, and then solving the conflict, thereby realizing a function of not manually intervening a synchronization conflict point in a synchronization process; Compared with the prior art, the method gets rid of dependence on manpower, conflicts can be found autonomously, a proper mode is selected to check and solve conflict points, source codes and target branch codes of conflict files are synchronized and recorded automatically, and high efficiency and safe control of code synchronization are ensured.

Description

technical field [0001] The application belongs to the technical field of software development, and in particular relates to a synchronization method and device for automatically identifying and resolving synchronization conflicts. Background technique [0002] The development of software products on the Gerrit platform often involves the participation of multiple people and the parallel development of multiple versions. After the requirements on the development branch are developed and the tests pass, the code of the development branch needs to be synchronized to the production branch. After the code of the production branch changes, the latest content also needs to be synchronized to other parallel development branches to ensure that all development branches The codes of all include the content of the production branch to ensure the accuracy of the development basis. In this development scenario, code synchronization between branches is an important issue that often needs ...

AI Technical Summary

Problems solved by technology

[0004] This application provides a synchronization method and device for automatically identifying synchronization conflicts and resolving conflicts, so as to at least solve the problem that when the current code conflicts, the built-in code synchronization mechanism will be interrupted. At this time, manual intervention is required to confirm the synchronization conflict point before continuing to execute The problem

Images