CN114428739A

CN114428739A - File merging method, device, equipment, storage medium and product

Info

Publication number: CN114428739A
Application number: CN202210085887.3A
Authority: CN
Inventors: 刘艳红; 刘俊启
Original assignee: Beijing Baidu Netcom Science and Technology Co Ltd
Current assignee: Beijing Baidu Netcom Science and Technology Co Ltd
Priority date: 2022-01-25
Filing date: 2022-01-25
Publication date: 2022-05-03

Abstract

The disclosure provides a file merging method, a file merging device, file merging equipment, a storage medium and a file merging product, and relates to the technical field of computers, in particular to the field of the Internet of things. The specific implementation scheme is as follows: aiming at any development branch, obtaining modification operation on a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in a modification file; reading at least one modification record from the modification file in response to a merging test request triggered by a user; determining a target modification record aiming at a target warehouse file according to at least one modification record; and according to the target modification record of the target warehouse file, carrying out merging modification processing on the target warehouse file to obtain the modified target warehouse file. The technical scheme of the disclosure improves the merging efficiency of the warehouse files.

Description

File merging method, device, equipment, storage medium and product

Technical Field

The present disclosure relates to the field of internet of things in the field of computer technologies, and in particular, to a method, an apparatus, a device, a storage medium, and a product for merging files.

Background

In the development process of the application program, the development process can be divided into a development branch, an integration test branch and a formal release branch according to different development stages. In order to improve development efficiency, a plurality of development branches may be provided. Each development branch may be responsible for development and testing of a corresponding program function. Each development branch may modify a repository file that implements a corresponding function, and the repository file may store program codes of the application program. The integrated test branch may merge repository files of multiple development branches. When merging, the modifications of different branches to the same warehouse file are merged by hand. However, the workload of the manual merging mode is large, so that the merging efficiency of the integrated test branch on different development branches in the same warehouse file is too low in the software development process.

Disclosure of Invention

The present disclosure provides a file merging method, apparatus, device, storage medium and product for integration testing of an application.

According to a first aspect of the present disclosure, there is provided a file merging method, including:

aiming at any development branch, obtaining modification operation on a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in a modification file;

reading at least one modification record from the modification file in response to a merging test request triggered by a user;

determining a target modification record aiming at a target warehouse file according to at least one modification record;

and according to the target modification record of the target warehouse file, carrying out combined modification processing on the target warehouse file to obtain the modified target warehouse file.

According to a second aspect of the present disclosure, there is provided a file merging apparatus including:

the operation detection unit is used for detecting the modification operation of the warehouse file of the development branch aiming at any development branch, obtaining the modification record of the warehouse file and storing the modification record in the modification file;

the record reading unit is used for reading at least one modification record from the modification file in response to a merging test request triggered by a user;

the record determining unit is used for determining a target modification record aiming at the target warehouse file according to at least one modification record;

and the file modification unit is used for carrying out merging modification processing on the target warehouse file according to the target modification record of the target warehouse file to obtain the modified target warehouse file.

According to a third aspect of the present disclosure, there is provided an electronic device comprising:

at least one processor; and

a memory communicatively coupled to the at least one processor; wherein the content of the first and second substances,

the memory stores instructions executable by the at least one processor to enable the at least one processor to perform the method of the first aspect.

According to a fourth aspect of the present disclosure, there is provided a non-transitory computer readable storage medium having stored thereon computer instructions for causing the computer to perform the method of the first aspect.

According to a fifth aspect of the present disclosure, there is provided a computer program product comprising: a computer program, stored in a readable storage medium, from which at least one processor of an electronic device can read the computer program, execution of the computer program by the at least one processor causing the electronic device to perform the method of the first aspect.

According to the technology disclosed by the invention, the problem that the merging efficiency of a plurality of warehouse files in the integrated test is too low due to manual merging is solved, the modification of the warehouse files can be accurately recorded by recording the modification of the warehouse files, the merging work of the application program can be automatically completed by using the recording records of the warehouse files, an accurate merging result is obtained, and the merging efficiency of the files can be improved by automatically executing the merging work of the files.

It should be understood that the statements in this section do not necessarily identify key or critical features of the embodiments of the present disclosure, nor do they limit the scope of the present disclosure. Other features of the present disclosure will become apparent from the following description.

Drawings

The drawings are included to provide a better understanding of the present solution and are not to be construed as limiting the present disclosure. Wherein:

fig. 1 is a schematic application diagram of a file merging method provided in an embodiment of the present disclosure;

FIG. 2 is a flow chart of one embodiment of a file merge method provided by embodiments of the present disclosure;

FIG. 3 is a flowchart of yet another embodiment of a file merging method provided by an embodiment of the present disclosure;

FIG. 4 is a flowchart of yet another embodiment of a file merging method provided by an embodiment of the present disclosure;

FIG. 5a is an exemplary diagram of a repository file for one module provided by embodiments of the present disclosure;

FIG. 5b is an exemplary diagram of a warehouse file of yet another module provided by embodiments of the present disclosure;

FIG. 6 is an exemplary diagram of a modified warehouse file provided by an embodiment of the present disclosure;

FIG. 7 is a schematic structural diagram of an embodiment of a file merging device according to an embodiment of the present disclosure;

FIG. 8 is a block diagram of an electronic device for implementing a file merging method of an embodiment of the present disclosure.

Detailed Description

Exemplary embodiments of the present disclosure are described below with reference to the accompanying drawings, in which various details of the embodiments of the disclosure are included to assist understanding, and which are to be considered as merely exemplary. Accordingly, those of ordinary skill in the art will recognize that various changes and modifications of the embodiments described herein can be made without departing from the scope and spirit of the present disclosure. Also, descriptions of well-known functions and constructions are omitted in the following description for clarity and conciseness.

The technical scheme disclosed by the invention can be applied to an integrated test scene of software, when a plurality of development branches test different modules of the same software, the modification contents of the plurality of development branches can be recorded, and the recorded modification contents are utilized to automatically complete file merging, so that the file merging efficiency is improved.

In the related art, in the process of program development, based on different stages of development, the program development can be divided into a development branch, an integration test branch and a formal release branch. In order to improve the development efficiency, a plurality of development branches may be provided, and each development branch is responsible for development of a development function, testing, and the like. Different development branches can respectively acquire the corresponding functional modules and modify the corresponding functional modules. In practical application, different development branches can be used for multiplexing the same module, the module actually refers to a warehouse file which can realize corresponding functions during operation, and the different development branches can respectively modify the warehouse file under the development branches. Therefore, different development branches can modify the copy of the same warehouse file during development, and the same warehouse file may correspond to a plurality of modified copies. At the end of development of each development branch, the integrated testing branch may merge the modifications of the same warehouse file by different development branches, for example, under the a branch, the modification of the file a1 is a1 ', and under the B branch, the file a1 is moved from the a branch to the B branch, and the integrated testing branch merges the modifications and the movement of the a1 file by the AB two branches, resulting in the a 1' file located on the B branch.

In practical applications, due to the reusability of program codes, different development branches may modify the same warehouse file respectively. After the test is finished, the integrated test branch merges the modified contents of different development branches, and usually, the modification of different development branches for the same warehouse file is merged manually. However, the workload of the manual merging mode is large, so that the merging efficiency of the integrated test branch on different development branches in the same warehouse file is too low in the software development process.

In order to solve the above technical problem, in the embodiment of the present disclosure, for any development branch, a modification operation of a warehouse file of the development branch may be detected, a modification record of the warehouse file is obtained, and the modification record is stored in the modification file. The modification record may serve as a reference basis for the modification. When a merging test request triggered by a user is obtained, at least one modification record can be read from the modification file in response to the merging test request, a target modification record for the target warehouse file is determined according to the at least one modification record, and merging modification processing is performed on the target warehouse file according to the target modification record of the target warehouse file to obtain a modified target warehouse file. The modification of the warehouse file can be accurately recorded by recording the modification of the warehouse file, the merging work of the application program can be automatically completed by using the recording record of the warehouse file, an accurate merging result is obtained, and the merging efficiency of the file can be improved by automatically executing the merging work of the file.

The embodiment of the disclosure provides a file merging method, a file merging device, equipment, a storage medium and a file merging product, which are applied to the field of internet of things in the technical field of computers, so that modification of a plurality of development branches on corresponding target warehouse files is automatically merged, and merging efficiency is improved.

The technical solution of the present disclosure will be described in detail with reference to the accompanying drawings.

For convenience of understanding, as shown in fig. 1, an application diagram of a file merging method provided in the embodiment of the present disclosure is shown.

In the development process of the application program, each function of the application program may be divided into different development branches, a development device of the development branch, for example, the notebook 1 may obtain, based on a request of a developer, a warehouse file corresponding to the allocated development function from the electronic device 2, and the development device 1 may detect a modification operation of the developer on the developer, and obtain a modification record of the warehouse file. The development device 1 can send the detected modification operation and the modification record to an electronic device, for example, a computer 2. The electronic device may be a device for integrated testing.

The electronic device, that is, the computer 2, may obtain the modification operation of any development branch on the corresponding warehouse file, and obtain the modification record of the warehouse file. The computer 2 may also respond to the merging test request triggered by the integration test user based on the file merging method provided in the embodiment of the present disclosure, execute modification processing for the target warehouse file, and obtain the modified target warehouse file. By automatically merging and modifying the target warehouse file, the warehouse file does not need to be manually merged and modified, the modification efficiency of the warehouse file is improved, and finally the integration test efficiency of the application program is effectively improved.

As shown in fig. 2, a flowchart of an embodiment of a file merging method provided by the embodiment of the present disclosure may be configured as a file merging device, and the file merging device may be located in an electronic device. The file merging method can comprise the following steps:

201: and aiming at any development branch, obtaining the modification operation of the warehouse file of the development branch, obtaining the modification record of the warehouse file, and storing the modification record in the modification file.

In the development process of an Application program (full name: Application, abbreviated as APP), codes are complex, for example, a super APP can be composed of multiple lines of codes, the number of the codes can be in the order of ten thousand, in order to improve the management efficiency of the codes, the codes can be divided into multiple modules, and the number of the modules is in the order of hundred. In the process of developing the APP, research and development personnel can modify one or more modules simultaneously and modify or perfect the corresponding functions of the modules. In order to improve the development efficiency, a plurality of development branches can be adopted to modify the corresponding functional modules. Any development branch in the embodiments of the present disclosure may refer to a module corresponding to a certain function of an application, and the module may include at least one repository file. The repository file of the development branch may include at least one. The research and development personnel can modify at least one warehouse file of the development branch through the user equipment and provide modification operation of the at least one warehouse file to the electronic equipment configured with the file merging method of the embodiment of the disclosure.

Therefore, the user equipment can detect the modification operation of the user corresponding to the development branch on the warehouse file of the development branch, and send the modification operation on the warehouse file to the electronic equipment. The electronic device may receive a modification operation of the warehouse file of the development branch sent by the user device. The modification operation may include modifying the contents of the repository file. Wherein obtaining the modification record of the warehouse file may include: and determining the modification content in the modification operation, and generating a modification record of the warehouse file according to the modification content. Modifying the record may include: modifying information such as modifying content, modifying category, modifying time, file name of modified warehouse file, etc.

The development branch may include at least one, and the modification operation on the warehouse file corresponding to the at least one development branch may be obtained, so as to obtain the modification record of the warehouse file corresponding to the at least one development branch.

202: at least one modification record is read from the modification file in response to a user-triggered merge test request.

Alternatively, the electronic device may detect a user-triggered merge test request. The user may be a user who performs merge management of codes. The electronic device may display a merge control for the merge test for the user, and the user triggers the merge control, and at this time, the electronic device may generate a merge test request triggered by the user when detecting that the user triggers the merge control.

The at least one modification record read from the modification file may be a modification record of the at least one development branch. A development branch may provide one or more modification records.

203: and determining a target modification record aiming at the target warehouse file according to the at least one modification record.

Alternatively, the target repository file may be a repository file that is modified by any of the applications.

In order to control the modification of the warehouse files by the user, the target warehouse file selected by the user from at least one warehouse file can be detected to obtain the target warehouse file. The at least one repository file may be all repository files of the application program, and of course, in order to improve the selection efficiency, the at least one repository file may also be all modified repository files in the application program.

The target warehouse file may also be automatically selected in order to improve modification efficiency. A target warehouse file may be selected from the at least one warehouse file. In order to manage the files, each warehouse file may correspond to a file name, and the file names of different warehouse files are different.

Determining, from the at least one modification record, a target modification record for the target warehouse file may include: determining the file name of the modified warehouse file corresponding to each modification record; and selecting modification records which are the same as the target file name of the target warehouse file from the file names respectively corresponding to the at least one modification record to obtain the target modification records. The target modification record of the target warehouse file may include at least one. At least one target modification record of the target warehouse file may be obtained for a modification operation provided by one or more development branches.

204: and according to the target modification record of the target warehouse file, merging and modifying the target warehouse file to obtain a modified target warehouse file.

Optionally, the target warehouse file may be merged according to at least one target modification record of the target warehouse file to obtain a modified target warehouse file.

According to the target modification record, performing merging modification processing on the target warehouse file, and obtaining the modified target warehouse file may include: and determining the modification content in the target warehouse file, and carrying out merging modification processing on the target warehouse file according to the modification content to obtain the modified target warehouse file.

In the embodiment of the disclosure, for any development branch, the modification operation of the warehouse file of the development branch can be detected, the modification record of the warehouse file is obtained, and the modification record is stored in the modification file. The modification record may serve as a reference basis for the modification. When a merging test request triggered by a user is obtained, at least one modification record can be read from the modification file in response to the merging test request, a target modification record for the target warehouse file is determined according to the at least one modification record, and merging modification processing is performed on the target warehouse file according to the target modification record of the target warehouse file to obtain a modified target warehouse file. The modification of the warehouse file can be accurately recorded by recording the modification of the warehouse file, the merging work of the application program can be automatically completed by using the recording record of the warehouse file, an accurate merging result is obtained, and the merging efficiency of the file can be improved by automatically executing the merging work of the file.

As an embodiment, after the storing the modification record in the modification file, the method further includes:

generating a modification instruction corresponding to the modification record according to the modification operation corresponding to the modification record;

according to the target modification record of the target warehouse file, merging and modifying the target warehouse file to obtain a modified target warehouse file, which comprises the following steps:

acquiring a modification instruction corresponding to the target modification record;

and operating a modification instruction corresponding to the target modification record, and carrying out merging modification processing on the target warehouse file to obtain a modified target warehouse file.

Optionally, generating a modification instruction corresponding to the modification record according to the modification operation corresponding to the modification record may include: and acquiring modification operation corresponding to the modification record, acquiring modification content and modification type corresponding to the modification record, and generating a modification instruction corresponding to the modification record according to the modification content and the modification type. The modified content may include content added to or deleted from the repository file, and the modification category may include a modification type corresponding to a modification operation on the repository file, and may include types of addition, deletion, or modification.

In the embodiment of the present disclosure, after the modification record is stored in the modification file, the modification instruction corresponding to the modification record may be generated according to the modification operation corresponding to the modification record, and when the target warehouse file is modified, the modification instruction corresponding to the target modification record may be obtained, the modification instruction corresponding to the target modification record is run, and the target warehouse file is merged and modified to obtain the modified target warehouse file. By automatically generating the corresponding modification instruction according to the modification record, the modification instruction can be directly operated under the condition that the target warehouse file needs to be modified, and the modification efficiency is improved.

As shown in fig. 3, a flowchart of an embodiment of a file merging method provided by the embodiment of the present disclosure may be configured as a file merging device, and the file merging device may be located in an electronic device. The file merging method can comprise the following steps:

301: and aiming at any development branch, obtaining the modification operation of the warehouse file of the development branch, obtaining the modification record of the warehouse file, and storing the modification record in the modification file.

Some steps in the embodiments of the present disclosure are the same as those in the embodiments described above, and are not repeated herein for the sake of brevity of description.

302: and reading at least one modification record from the modification file in response to a user-triggered merging test request.

303: and dividing the modification records with the same modification object into the same modification group according to the modification object corresponding to the at least one modification record respectively to obtain at least one modification group.

The modification object of the modification record may refer to the repository file being modified. The file name of the modified repository file may be included in the modification record. The modification object may be identified using a file name of the repository file. Dividing the modification records with the same modification object into the same modification group may include: and dividing the files with the same name in the modification record into the same modification group. The modification group may include at least one modification record that modifies the same repository file.

304: and determining a target modification group from at least one modification group, and acquiring a modification object corresponding to the target modification group as a target warehouse file.

In order to improve modification efficiency, target modification groups can be determined from at least one modification group in sequence, and the target warehouse file corresponding to the modification object corresponding to each target modification group is determined. The target file name of the warehouse file corresponding to at least one modification record in the target modification group may be obtained to determine the target warehouse file corresponding to the target file name.

305: and reading at least one modification record in the target modification group as a target modification record.

The target modification record may be comprised of at least one modification record in the target modification group.

306: and according to the target modification record of the target warehouse file, merging and modifying the target warehouse file to obtain a modified target warehouse file.

Optionally, the target warehouse file may be merged and modified according to at least one modification record corresponding to the target modification record, so as to obtain a modified target warehouse file. After the target warehouse file is merged and modified according to the target modification record of the target warehouse file and the modified target warehouse file is obtained, the step of determining the target modification group from the at least one modification group can be returned to and continuously executed until the traversal of the at least one modification group is finished.

In the embodiment of the disclosure, for any development branch, the modification operation of the warehouse file of the development branch can be obtained, the modification record of the warehouse file is obtained, and the modification record is stored in the modification file. And merging the test requests triggered by the corresponding users so as to read at least one modification record from the modification file. The modification records with the same modification object can be divided into the same modification group according to the modification object corresponding to each of the at least one modification record, so as to obtain at least one modification group. Through the mode of object division, the same object modification record can be uniformly determined. And determining a target modification group from at least one modification group to obtain a modification object corresponding to the target modification group as a target warehouse file, obtaining the target warehouse file of the modification object corresponding to the modification group by determining the target modification group to realize the acquisition of the modified warehouse object, and determining at least one modification record in the target modification group as a target modification record to realize the acquisition of the modification record of the same modification object. The acquisition accuracy of the modified object is improved. And according to the target modification record of the target warehouse file, merging and modifying the target warehouse file to obtain a merged and modified target warehouse file, so that the merging and modifying accuracy and efficiency of the target warehouse file are improved.

As an embodiment, determining a target modification group from the at least one modification group may comprise:

sequencing at least one modification group to obtain at least one sequenced modification group;

and determining the target modification groups from the at least one modification group in sequence according to the sequencing order of the at least one modification group.

When the target modification group is determined for at least one modification group, the at least one modification group can be sequenced, the modification sequence of the modification group can be confirmed, and modification omission is avoided.

Ordering the at least one modification group may comprise: at least one modification group is randomly ordered. The method can also comprise the following steps: and sequencing at least one modification group according to the sequence of the modification time. The modification time of the modification group may include a modification time of a last modification record or a modification time of a first modification record in the modification group.

In the embodiment of the present disclosure, when determining the target modification group, the at least one modification group may be sorted first, so that the target modification group is determined from the at least one modification group in sequence according to the sorting order of the at least one modification group. The selection of the target modification group can be more regular through the sequencing, the missing modification group is avoided, and the determining efficiency and accuracy of the target modification group are improved.

In some embodiments, the target modification records of the target warehouse file may include at least one. As shown in fig. 4, a flowchart of an embodiment of a file merging method provided by the embodiment of the present disclosure may be configured as a file merging device, and the file merging device may be located in an electronic device. The file merging method can comprise the following steps:

401: and aiming at any development branch, obtaining the modification operation of the warehouse file of the development branch, obtaining the modification record of the warehouse file, and storing the modification record in the modification file.

Some steps in the embodiments of the present disclosure are the same as those in the embodiments described above, and are not described herein again for the sake of accuracy of description.

402: at least one modification record is read from the modification file in response to a user-triggered merge test request.

403: at least one target modification record for the target warehouse file is determined based on the at least one modification record.

The target modification records of the target repository file may include at least one. The at least one target modification record may be a modification record for the target warehouse file.

404: and determining the modification sequence corresponding to at least one target modification record respectively.

The at least one target modification record of the target warehouse file may be randomly determined. The modification sequence corresponding to each of the at least one target modification record may be randomly determined.

Optionally, the warehouse files may be modified sequentially by using the target modification records according to a modification sequence corresponding to each of the at least one target modification record, so as to obtain modified target warehouse files.

405: and determining the current target modification record according to the modification sequence corresponding to at least one target modification record, if the current target modification record is stored in the previous target modification record, modifying the modification result of the target warehouse file by using the current target modification record again to obtain the modification result of the current target modification record until the last target modification record is modified, and obtaining the modified target warehouse file.

Modifying the warehouse file sequentially using the target modification records according to the modification sequence corresponding to each of the at least one target modification record, and obtaining the modified target warehouse file may include: and determining the current target modification record according to the modification sequence corresponding to at least one target modification record, if the current target modification record is stored in the previous target modification record, modifying the modification result of the target warehouse file by using the current target modification record again to obtain the modification result of the current target modification record until the last target modification record is modified, and obtaining the modified target warehouse file.

When the target warehouse file corresponding to at least one modification record is merged and modified according to the modification sequence corresponding to at least one target modification record, the modification result of the warehouse file by the previous target modification record can be used as the modification basis of the warehouse file by the next target modification record.

And sequentially determining the current target modification record from the first target modification record according to the modification sequence corresponding to the at least one target modification record respectively. And if the current target modification record exists in the previous target modification record, modifying the modification result of the target warehouse file again by using the previous target modification record to obtain the modification result of the current target modification record on the target warehouse file, returning to the step of determining the current target modification record and continuing to execute until the last target modification record is modified, and obtaining the modified target warehouse file. And the modification result obtained by modifying the modification result of the previous modification record again by the last modification record is the modified target warehouse file.

In the embodiment of the present disclosure, the merging modification processing is performed on the target warehouse file according to the target modification records of the target warehouse file, the modification sequence corresponding to each of the at least one target modification record may be determined, the current target modification record is determined according to the modification sequence corresponding to each of the at least one target modification record, if the current target modification record exists in the previous target modification record, the modification result of the previous target modification record on the target warehouse file is modified again by using the current target modification record, the modification result of the current target modification record is obtained, until the modification of the last target modification record is completed, and the final modified target warehouse file is obtained. By the modification effect of the target warehouse file, the modification result of the previous target modification record is used as the modification basis of the next modification record, so that accurate combination modification is realized, missing modification or invalid modification is avoided, and the combination modification efficiency and accuracy are improved.

As one embodiment, any of the target modification records includes a modification time;

determining a modification sequence corresponding to each of the at least one target modification record, including:

determining modification time corresponding to at least one target modification record of a target warehouse file;

and determining the modification sequence corresponding to the at least one target modification record according to the modification time corresponding to the at least one target modification record.

Optionally, the modification time may be included in the target modification record.

As a possible implementation manner, when determining the modification sequence corresponding to each of the at least one target modification record according to the modification time corresponding to each of the at least one target modification record, if the modification time corresponding to each of any two target modification records is the same, randomly determining the modification sequence corresponding to each of two target modification records with the same modification time.

In the embodiment of the disclosure, modification times respectively corresponding to at least one target modification record of a target warehouse file are determined, a modification sequence respectively corresponding to at least one modification record can be determined according to the modification times respectively corresponding to at least one target modification record, and the modification sequence can be accurately determined by taking the modification times as a determination basis of the modification sequence.

In some embodiments, the target repository file includes a repository resident program module; the at least one target modification record includes: changing the file migration record of the program module where the target warehouse file is located and the content modification record of the file content of the target warehouse file;

determining a modification sequence corresponding to each of the at least one target modification record according to the modification time corresponding to each of the at least one target modification record, including:

if the modification time of the file migration record is determined to be before the content modification record, determining that the modification sequence of the file migration record is before the content modification record;

and if the modification time of the file migration record is determined to be after the content modification record, determining the modification sequence of the content modification record to be before the file migration record.

Under the condition that the modification sequence of the file migration record is before the content modification record, the file migration record can be used for migrating the target warehouse file, and then the content modification record is used for modifying the migrated target warehouse file to obtain the modified target warehouse file.

Under the condition that the modification record of the content modification record is located before the file migration record, the content modification record can be used for modifying the target warehouse file to obtain a modification result, and then the file migration record is used for migrating the modification result to obtain the modified target warehouse file.

For ease of understanding, module A in FIG. 5a may include warehouse file a1 and warehouse file a2, and module B in FIG. 5B may include warehouse file B1 and warehouse file B2. Suppose a U1 user submits a file migration operation to the repository file a1, resulting in a corresponding file migration record, which is migrated from the A module to the B module. The U2 user submitted a modify operation to repository file a1, resulting in a corresponding content modification record, a1 becoming a 1'.

If the time of the file migration record is before the time of the content modification record, the repository file a1 may be migrated to module B first according to the file migration record. And then, according to the content modification record, obtaining the modified contents of a1 to a1 ', and modifying the warehouse file a1 in the module B by using the modified contents to obtain the warehouse file a 1' located in the module B.

If the time of the content modification record is before the time of the file migration record, the repository file a1 may be modified to a 1' in module a according to the content modification record. The warehouse file a1 'is then migrated to module B based on the file migration record, obtaining warehouse file a 1' located in module B.

Referring to fig. 6, after modifying the warehouse file a1 in the module a with the file migration record and the content modification record, the obtained module a includes a warehouse file a2, and the module B includes a warehouse file a 1', a warehouse file B1, and a warehouse file B2.

In the embodiment of the present disclosure, when determining the modification sequence corresponding to each of the at least one target modification record according to the modification time corresponding to each of the at least one target modification record, if it is determined that the modification time of the file migration record is located before the content modification record, it is determined that the modification sequence of the file migration record is located before the content modification record, and if it is determined that the modification time of the file migration record is located after the content modification record, it is determined that the modification sequence of the content modification record is located before the file migration record. By sequentially confirming the modification time of the file migration record and the file modification record, the sequence of the file migration record and the file modification record can be accurately confirmed.

As an embodiment, for any development branch, detecting a modification operation on a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in the modification file, may include:

a first commit request submitted by at least one development branch belonging to the same development group is detected.

And responding to the first submission request, acquiring modification operations of the warehouse files corresponding to at least one development branch transmitted by the development group, acquiring modification records of the warehouse files corresponding to the at least one development branch, and storing the modification records of the warehouse files corresponding to the at least one development branch in the modification files.

The modification operation submitted by at least one development branch in the same development group can be uploaded uniformly. In one possible design, the modification time of the modification record may be a commit time when the development branch commits the modification operation.

In the embodiment of the present disclosure, a development group is used as a submission unit, and modification records submitted by at least one development branch of the same development group can be provided to a modification file. The method has the advantages that the submitting efficiency of the modification records can be improved by taking the development group as a unit, so that the modification contents of the same group are not conflicted or overlapped, and the submitting accuracy of the modification records is improved.

As another embodiment, for any development branch, detecting a modification operation on a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in the modification file, includes:

a second commit request of any development branch commit is detected.

And responding to the second submission request, acquiring the modification operation of the warehouse file corresponding to the development branch submitted by the development branch, acquiring the modification record of the warehouse file, and storing the modification record in the modification file.

Alternatively, any one of the development branches may submit modification operations separately, generating a corresponding modification record.

In the embodiment of the disclosure, the development branches are taken as the transaction unit, any development branch can directly submit the second submission request, and in response to the second submission request, the modification operations of the warehouse files respectively submitted by the development branches can be obtained, the modification records of the warehouse files are obtained, and the modification records are stored in the modification files. By taking the development branch as a submitting unit for modifying the record, the modification accuracy of the modified record can be ensured, the personalized submission of the development branch is realized, and the interactive effectiveness is improved.

As shown in fig. 7, a schematic structural diagram of an embodiment of a file merging apparatus provided in an embodiment of the present disclosure, the apparatus may be located in an electronic device, and the file merging apparatus 700 may include the following units:

operation detection unit 701: the method is used for detecting the modification operation of the warehouse file of the development branch aiming at any development branch, obtaining the modification record of the warehouse file, and storing the modification record in the modification file.

The record reading unit 702: and the system is used for reading at least one modification record from the modification file in response to a merging test request triggered by a user.

The recording determination unit 703: for determining a target modification record for the target repository file based on the at least one modification record.

The file modification unit 704: and the system is used for merging and modifying the target warehouse file according to the target modification record of the target warehouse file to obtain the modified target warehouse file.

As an embodiment, further comprising:

the instruction generating unit is used for generating a modification instruction corresponding to the modification record according to the modification operation corresponding to the modification record;

a file modification unit comprising:

the instruction acquisition module is used for acquiring a modification instruction corresponding to the target modification record;

and the instruction operation module is used for operating the modification instruction corresponding to the target modification record, and performing merging modification processing on the target warehouse file to obtain the modified target warehouse file.

In certain embodiments, the method comprises:

and the object dividing module is used for dividing the modification records with the same modification object into the same modification group according to the modification object corresponding to the at least one modification record respectively to obtain at least one modification group.

And the target acquisition module is used for determining a target modification group from at least one modification group and acquiring a modification object corresponding to the target modification group as a target warehouse file.

And the record reading module is used for reading at least one modification record in the target modification group as a target modification record.

As an embodiment, the target acquisition module includes:

the sequencing submodule is used for sequencing the at least one modification group to obtain at least one sequenced modification group;

and the sequence determining submodule is used for sequentially determining the target modification group from the at least one modification group according to the sequencing sequence of the at least one modification group.

In some embodiments, the target modification records of the target warehouse file include at least one;

a file modification unit comprising:

the sequence determining module is used for determining a modification sequence corresponding to each target modification record;

and the sequence modification module is used for determining the current target modification record according to the modification sequence corresponding to at least one target modification record, if the current target modification record is stored in the previous target modification record, modifying the modification result of the previous target modification record on the target warehouse file again by using the current target modification record to obtain the modification result of the current target modification record until the modification of the last target modification record is completed, and obtaining the target warehouse file obtained by modifying the previous modification result again.

In one possible design, any of the target modification records includes a modification time;

an order determination module comprising:

the time determining submodule is used for determining modification time corresponding to at least one target modification record of the target warehouse file;

and the sequence determining submodule is used for determining the modification sequence corresponding to the at least one target modification record according to the modification time corresponding to the at least one target modification record.

In some embodiments, the target repository file includes a program module in which the repository resides; the at least one target modification record includes: changing the file migration record of the program module where the target warehouse file is located and the content modification record of the file content of the target warehouse file;

the order determination submodule is specifically configured to:

As one embodiment, an operation detection unit includes:

the first detection module is used for detecting a first submission request submitted by at least one development branch belonging to the same development group;

the first obtaining module is used for responding to the first submission request, obtaining modification operations of at least one development branch transmitted by the development group on corresponding warehouse files respectively, obtaining modification records of the warehouse files corresponding to the at least one development branch respectively, and storing the modification records of the warehouse files corresponding to the at least one development branch in the modification files.

As still another embodiment, an operation detection unit includes:

the second detection module is used for detecting a second submission request submitted by any development branch;

and the second acquisition module is used for responding to the first submission request, acquiring the modification operation of the development branch submitted to the corresponding warehouse file, acquiring the modification record of the warehouse file, and storing the modification record in the modification file.

The file merging device in the embodiments of the present disclosure may execute the file merging method in the above embodiments, and for specific steps executed by each unit, module, and sub-module, reference may be made to contents recorded in the method, which are not described herein again.

In the technical scheme of the disclosure, the collection, storage, use, processing, transmission, provision, disclosure and other processing of the personal information of the related user are all in accordance with the regulations of related laws and regulations and do not violate the good customs of the public order.

The present disclosure also provides an electronic device, a readable storage medium, and a computer program product according to embodiments of the present disclosure.

According to an embodiment of the present disclosure, the present disclosure also provides a computer program product comprising: a computer program, stored in a readable storage medium, from which at least one processor of the electronic device can read the computer program, the at least one processor executing the computer program causing the electronic device to perform the solution provided by any of the embodiments described above.

FIG. 8 illustrates a schematic block diagram of an example electronic device 800 that can be used to implement embodiments of the present disclosure. Electronic devices are intended to represent various forms of digital computers, such as laptops, desktops, workstations, personal digital assistants, servers, blade servers, mainframes, and other appropriate computers. The electronic device may also represent various forms of mobile devices, such as personal digital processing, cellular phones, smart phones, wearable devices, and other similar computing devices. The components shown herein, their connections and relationships, and their functions, are meant to be examples only, and are not meant to limit implementations of the disclosure described and/or claimed herein.

As shown in fig. 8, the apparatus 800 includes a computing unit 801 that can perform various appropriate actions and processes according to a computer program stored in a Read Only Memory (ROM)802 or a computer program loaded from a storage unit 808 into a Random Access Memory (RAM) 803. In the RAM 803, various programs and data required for the operation of the device 800 can also be stored. The calculation unit 801, the ROM 802, and the RAM 803 are connected to each other by a bus 804. An input/output (I/O) interface 805 is also connected to bus 804.

A number of components in the device 800 are connected to the I/O interface 805, including: an input unit 806, such as a keyboard, a mouse, or the like; an output unit 807 such as various types of displays, speakers, and the like; a storage unit 808, such as a magnetic disk, optical disk, or the like; and a communication unit 809 such as a network card, modem, wireless communication transceiver, etc. The communication unit 809 allows the device 800 to exchange information/data with other devices via a computer network such as the internet and/or various telecommunication networks.

Computing unit 801 may be a variety of general and/or special purpose processing components with processing and computing capabilities. Some examples of the computing unit 801 include, but are not limited to, a Central Processing Unit (CPU), a Graphics Processing Unit (GPU), various dedicated Artificial Intelligence (AI) computing chips, various computing units running machine learning model algorithms, a Digital Signal Processor (DSP), and any suitable processor, controller, microcontroller, and the like. The calculation unit 801 executes the respective methods and processes described above, such as the file merge method. For example, in some embodiments, the file merging method may be implemented as a computer software program tangibly embodied in a machine-readable medium, such as storage unit 808. In some embodiments, part or all of the computer program can be loaded and/or installed onto device 800 via ROM 802 and/or communications unit 809. When loaded into RAM 803 and executed by computing unit 801, a computer program may perform one or more of the steps of the file merging method described above. Alternatively, in other embodiments, the computing unit 801 may be configured to perform the file merging method in any other suitable manner (e.g., by means of firmware).

Various implementations of the systems and techniques described here above may be implemented in digital electronic circuitry, integrated circuitry, Field Programmable Gate Arrays (FPGAs), Application Specific Integrated Circuits (ASICs), Application Specific Standard Products (ASSPs), system on a chip (SOCs), Complex Programmable Logic Devices (CPLDs), computer hardware, firmware, software, and/or combinations thereof. These various embodiments may include: implemented in one or more computer programs that are executable and/or interpretable on a programmable system including at least one programmable processor, which may be special or general purpose, receiving data and instructions from, and transmitting data and instructions to, a storage system, at least one input device, and at least one output device.

Program code for implementing the methods of the present disclosure may be written in any combination of one or more programming languages. These program codes may be provided to a processor or controller of a general purpose computer, special purpose computer, or other programmable data processing apparatus, such that the program codes, when executed by the processor or controller, cause the functions/operations specified in the flowchart and/or block diagram to be performed. The program code may execute entirely on the machine, partly on the machine, as a stand-alone software package, partly on the machine and partly on a remote machine or entirely on the remote machine or server.

In the context of this disclosure, a machine-readable medium may be a tangible medium that can contain, or store a program for use by or in connection with an instruction execution system, apparatus, or device. The machine-readable medium may be a machine-readable signal medium or a machine-readable storage medium. A machine-readable medium may include, but is not limited to, an electronic, magnetic, optical, electromagnetic, infrared, or semiconductor system, apparatus, or device, or any suitable combination of the foregoing. More specific examples of a machine-readable storage medium would include an electrical connection based on one or more wires, a portable computer diskette, a hard disk, a Random Access Memory (RAM), a read-only memory (ROM), an erasable programmable read-only memory (EPROM or flash memory), an optical fiber, a portable compact disc read-only memory (CD-ROM), an optical storage device, a magnetic storage device, or any suitable combination of the foregoing.

To provide for interaction with a user, the systems and techniques described here can be implemented on a computer having: a display device (e.g., a CRT (cathode ray tube) or LCD (liquid crystal display) monitor) for displaying information to a user; and a keyboard and a pointing device (e.g., a mouse or a trackball) by which a user can provide input to the computer. Other kinds of devices may also be used to provide for interaction with a user; for example, feedback provided to the user can be any form of sensory feedback (e.g., visual feedback, auditory feedback, or tactile feedback); and input from the user may be received in any form, including acoustic, speech, or tactile input.

The systems and techniques described here can be implemented in a computing system that includes a back-end component (e.g., as a data server), or that includes a middleware component (e.g., an application server), or that includes a front-end component (e.g., a user computer having a graphical user interface or a web browser through which a user can interact with an implementation of the systems and techniques described here), or any combination of such back-end, middleware, or front-end components. The components of the system can be interconnected by any form or medium of digital data communication (e.g., a communication network). Examples of communication networks include: local Area Networks (LANs), Wide Area Networks (WANs), and the Internet.

The computer system may include clients and servers. A client and server are generally remote from each other and typically interact through a communication network. The relationship of client and server arises by virtue of computer programs running on the respective computers and having a client-server relationship to each other. The Server can be a cloud Server, also called a cloud computing Server or a cloud host, and is a host product in a cloud computing service system, so as to solve the defects of high management difficulty and weak service expansibility in the traditional physical host and VPS service ("Virtual Private Server", or simply "VPS"). The server may also be a server of a distributed system, or a server incorporating a blockchain.

It should be understood that various forms of the flows shown above may be used, with steps reordered, added, or deleted. For example, the steps described in the present disclosure may be executed in parallel, sequentially, or in different orders, and are not limited herein as long as the desired results of the technical solutions disclosed in the present disclosure can be achieved.

The above detailed description should not be construed as limiting the scope of the disclosure. It should be understood by those skilled in the art that various modifications, combinations, sub-combinations and substitutions may be made in accordance with design requirements and other factors. Any modification, equivalent replacement, and improvement made within the spirit and principle of the present disclosure should be included in the scope of protection of the present disclosure.

Claims

1. A file merging method, comprising:

determining a target modification record for a target warehouse file according to at least one modification record;

and according to the target modification record of the target warehouse file, carrying out merging modification processing on the target warehouse file to obtain the modified target warehouse file.

2. The method of claim 1, wherein after storing the modification record in a modification file, further comprising:

the merging and modifying the target warehouse file according to the target modification record of the target warehouse file to obtain the modified target warehouse file includes:

and operating a modification instruction corresponding to the target modification record, and performing merging modification processing on the target warehouse file to obtain the modified target warehouse file.

3. The method of claim 1, wherein said determining a target modification record for a target warehouse file from at least one of said modification records comprises:

dividing modification records with the same modification object into the same modification group according to the modification object corresponding to at least one modification record respectively to obtain at least one modification group;

determining a target modification group from at least one modification group, and acquiring a modification object corresponding to the target modification group as the target warehouse file;

and reading at least one modification record in the target modification group as the target modification record.

4. The method of claim 3, wherein said determining a target modification group from at least one of said modification groups comprises:

and sequentially determining a target modification group from at least one modification group according to the sequencing order of the at least one modification group.

5. The method of any of claims 1-4, wherein the target modification records of the target warehouse file include at least one;

determining a modification sequence corresponding to at least one target modification record respectively;

and determining a current target modification record according to a modification sequence corresponding to at least one target modification record, if the current target modification record is stored in a previous target modification record, modifying the modification result of the target warehouse file by using the current target modification record to the previous target modification record again to obtain the modification result of the current target modification record pair until the modification of the last target modification record is completed, and obtaining the modified target warehouse file.

6. The method of claim 5, wherein any of the target modification records includes a modification time;

the determining the modification sequence corresponding to at least one of the target modification records includes:

determining modification time corresponding to at least one target modification record of the target warehouse file;

and determining a modification sequence corresponding to at least one target modification record according to the modification time corresponding to at least one target modification record.

7. The method of claim 5, wherein the target warehouse file comprises a program module at which the warehouse is located; the at least one target modification record comprises: changing the file migration record of the program module where the target warehouse file is located and the content modification record of the file content of the target warehouse file;

the determining a modification sequence corresponding to each of the at least one target modification record according to the modification time corresponding to each of the at least one target modification record includes:

if the modification time of the file migration record is determined to be before the content modification record, determining that the modification sequence of the file migration record is determined to be before the content modification record;

and if the modification time of the file migration record is determined to be located after the content modification record, determining that the modification sequence of the content modification record is located before the file migration record.

8. The method according to any one of claims 1-7, wherein the detecting, for any development branch, a modification operation to a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in a modification file, comprises:

detecting a first submission request submitted by at least one development branch belonging to the same development group;

and responding to the first submission request, acquiring modification operations of at least one development branch transmitted by the development group on corresponding warehouse files respectively, acquiring modification records of the warehouse files corresponding to the at least one development branch respectively, and storing the modification records of the warehouse files corresponding to the at least one development branch in the modification files.

9. The method according to any one of claims 1-7, wherein the detecting, for any development branch, a modification operation to a warehouse file of the development branch, obtaining a modification record of the warehouse file, and storing the modification record in a modification file, comprises:

detecting a second submission request submitted by any development branch;

and responding to the second submission request, acquiring modification operation of the warehouse file corresponding to the development branch submitted by the development branch, acquiring a modification record of the warehouse file, and storing the modification record in a modification file.

10. A file merging apparatus comprising:

11. The apparatus of claim 10, further comprising:

the file modification unit comprises:

and the instruction operation module is used for operating the modification instruction corresponding to the target modification record, and carrying out merging modification processing on the target warehouse file to obtain the modified target warehouse file.

12. The apparatus of claim 10, the record determination unit, comprising:

the object dividing module is used for dividing modification records with the same modification object into the same modification group according to the modification object corresponding to at least one modification record respectively to obtain at least one modification group;

the target acquisition module is used for determining a target modification group from at least one modification group and acquiring a modification object corresponding to the target modification group as the target warehouse file;

and the record reading module is used for reading at least one modification record in the target modification group as the target modification record.

13. The apparatus of claim 12, the target acquisition module, comprising:

the sequencing submodule is used for sequencing at least one modification group to obtain at least one sequenced modification group;

and the sequence determining submodule is used for sequentially determining a target modification group from at least one modification group according to the sequencing sequence of at least one modification group.

14. The apparatus of any of claims 10-13, wherein the target modification records of the target warehouse file include at least one;

the file modification unit comprises:

the sequence determining module is used for determining a modification sequence corresponding to at least one target modification record;

and the sequence modification module is used for determining the current target modification record according to the modification sequence corresponding to at least one target modification record respectively, if the current target modification record is stored in the previous target modification record, modifying the modification result of the target warehouse file by using the current target modification record to the previous target modification record again to obtain the modification result of the current target modification record until the last target modification record is modified, and obtaining the target warehouse file obtained by modifying the previous modification result again.

15. The apparatus of claim 14, wherein any of said target modification records includes a modification time;

the order determination module includes:

the time determining sub-module is used for determining modification time corresponding to at least one target modification record of the target warehouse file;

and the sequence determining submodule is used for determining a modification sequence corresponding to at least one target modification record according to the modification time corresponding to at least one target modification record.

16. The apparatus of claim 15, wherein the target warehouse file comprises a program module at which a warehouse is located; the at least one target modification record comprises: changing the file migration record of the program module where the target warehouse file is located and the content modification record of the file content of the target warehouse file;

the order determination submodule is specifically configured to:

17. The apparatus of claims 10-16, wherein the operation detection unit comprises:

the first obtaining module is configured to, in response to the first submission request, obtain a modification operation of at least one development branch transmitted by the development group on a corresponding warehouse file, obtain a modification record of the warehouse file corresponding to the at least one development branch, and store the modification record of the warehouse file corresponding to the at least one development branch in the modification file.

18. The apparatus of claims 10-16, wherein the operation detection unit comprises:

and the second obtaining module is used for responding to the first submission request, obtaining the modification operation of the development branch on the corresponding warehouse file, obtaining the modification record of the warehouse file, and storing the modification record in the modification file.

19. An electronic device, comprising:

at least one processor; and

the memory stores instructions executable by the at least one processor to enable the at least one processor to perform the method of any one of claims 1-9.

20. A non-transitory computer readable storage medium having stored thereon computer instructions for causing the computer to perform the method of any one of claims 1-9.

21. A computer program product comprising a computer program which, when executed by a processor, carries out the steps of the method of any one of claims 1 to 9.