Code automatic merging method, device, computer equipment and storage medium

Abstract

The present invention relates to a method, device, computer equipment and storage medium for automatic code merging. The method includes: a server receives a code change query request sent by a terminal, the code change query request includes a code change date, and then the server finds the corresponding code change project in a database according to the code change date, determines the code change branch where the changed code is located according to the code change project, and the code change branch includes a release branch, a development branch and a test branch, and then the server sends a code merging instruction corresponding to the code change project to the terminal, and the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction, without finding the changed code, which greatly improves the efficiency of code merging and avoids the situation of missed merging and wrong merging in manual code merging.

Description

Technical Field

[0001] The present invention relates to the field of computer technology, and in particular to a method, device, computer equipment and storage medium for automatic code merging. Background Art

[0002] Currently, when developing software, there are usually multiple developers developing in parallel. After each developer develops the software, corresponding code changes will be made. After the code changes, it is usually necessary to merge the modified code into the main branch (master).

[0003] Traditional technologies usually merge codes manually, such as Jenkins, which first checks out the code locally, and then uses Jenkins to create a task to merge the checked-out code into the main branch. However, this manual merging method often results in forgotten operations, incorrect operations, etc., and when the amount of modified code data is large, developers usually need to find the modified code and then merge it one by one. The efficiency of merging is low, which will result in older code on the main branch, affecting the quality of the next online release. Summary of the invention

[0004] In view of the above problems, the present invention provides a method, device, computer equipment and storage medium for automatic code merging.

[0005] In a first aspect, a method for automatic code merging is provided, which is applied to a server, and the method comprises:

[0006] receiving a code change query request sent by a terminal, wherein the code change query request includes a code change date;

[0007] According to the code change date, the corresponding code change item is found in the database;

[0008] Determine the code change branch where the changed code is located according to the code change project, wherein the code change branch includes a release branch, a development branch, and a test branch;

[0009] The code merging instruction corresponding to the code change project is sent to the terminal, so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction.

[0010] In one embodiment, after the terminal automatically merges the code change branch into the trunk branch according to the code merge instruction, the method further includes:

[0011] Obtaining a merge result of the code change branch into the main branch;

[0012] Sending merge notification information including the merge result to the terminal.

[0013] In one embodiment, the code change query request sent by the receiving terminal is:

[0014] A code change query request sent by the terminal is received according to a first preset time.

[0015] In one embodiment, the method further comprises:

[0016] receiving a project change query request sent by the terminal, wherein the project change query request includes a project change date;

[0017] The corresponding changed project is found in the database according to the project change query date.

[0018] In one embodiment, the project change query request sent by the receiving terminal is:

[0019] A project change query request sent by the terminal is received according to a second preset time.

[0020] In one embodiment, before the code change query request sent by the receiving terminal, the method further includes:

[0021] The change notification information including the project change information is sent to the terminal, and the terminal sends the code change query request after receiving the change notification information.

[0022] In one embodiment, the code change project includes a code change domain name, under which corresponding code change branches and code merge instructions are stored, wherein the step of determining the code change branch where the change code is located according to the code change project is:

[0023] Find the corresponding code change domain name according to the code change project, and determine the code change branch where the changed code is located according to the code change domain name;

[0024] Steps to send the code merge instruction corresponding to the code change project to the terminal are:

[0025] A corresponding code merging instruction is determined according to the code change domain name, and the code merging instruction is sent to the terminal.

[0026] In a second aspect, a device for automatic code merging is provided, the device comprising:

[0027] A receiving module, configured to receive a code change query request sent by a terminal, wherein the code change query request includes a code change date;

[0028] A code change project determination module, used to find the corresponding code change project in the database according to the code change date;

[0029] A code change branch determination module, used to determine a code change branch according to the code change project, wherein the code change branch includes a release branch, a development branch, and a test branch;

[0030] The code merging instruction sending module sends the code merging instruction corresponding to the code change project to the terminal, so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction.

[0031] According to a third aspect, a computer device includes a memory and a processor, wherein the memory stores a computer program, and wherein the processor implements the steps of the method when executing the computer program.

[0032] In a fourth aspect, a computer-readable storage medium stores a computer program thereon, wherein the computer program implements the steps of the described method when executed by a processor.

[0033] The automatic code merging method of the present invention comprises the following steps: a server receives a code change query request sent by a terminal, the code change query request includes a code change date, and then the server finds a corresponding code change item in a database according to the code change date, and determines a code change branch where the changed code is located according to the code change item, the code change branch includes a release branch, a development branch and a test branch, and then the server sends a code merging instruction corresponding to the code change item to the terminal, and the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction, after receiving the code change query request through the server, after finding the code change item, directly determines the code change branch where the changed code is located, and the terminal automatically merges the code change branch into the trunk branch according to the merging instruction sent by the server, without finding the changed code, thereby greatly improving the efficiency of code merging and avoiding the situations of missed merging and erroneous merging in manual code merging. BRIEF DESCRIPTION OF THE DRAWINGS

[0034] In order to more clearly illustrate the technical solutions in the embodiments of the present invention, the following briefly introduces the drawings required for use in the description of the embodiments. Obviously, the drawings described below are only some embodiments of the present invention. For ordinary technicians in this field, other drawings can be obtained based on these drawings without creative work.

[0035] Figure 1 A method for automatically merging codes in one embodiment;

[0036] Figure 2 A method for automatically merging codes in another embodiment;

[0037] Figure 3The invention is a code automatic merging device in one embodiment. DETAILED DESCRIPTION

[0038] After receiving a code change query request through a server, the present invention finds the code change project and directly determines the code change branch where the changed code is located. The terminal automatically merges the code change branch into the trunk branch according to the merge instruction sent by the server, without finding the changed code. This greatly improves the efficiency of code merging and avoids missed merging and erroneous merging in manual code merging.

[0039] The following will further describe the automatic code merging method, apparatus, computer device and storage medium in conjunction with specific embodiments.

[0040] Embodiment 1

[0041] like Figure 1 As shown, this embodiment provides a method for automatic code merging, which is applied to a server, and the method includes:

[0042] S13. Receive a code change query request sent by the terminal, where the code change query request includes a code change date.

[0043] In this embodiment, the terminal sends a code change query request to the server to query whether there is a code change. The code change query request includes a code change query date. The server receives the code change query request sent by the terminal.

[0044] S14. Find the corresponding code change item in the database according to the code change date.

[0045] In this embodiment, the database stores the corresponding code change items in advance according to the code change date. The code change items are items in the software that have code modifications. For example, in shopping software, a common item is a shopping cart. If a certain interface information and interface information of the shopping cart are modified on 2020-12-21, then the database can be recorded in the form of a table, 2020-12-21, shopping cart, interface; 2020-12-21, shopping cart, interface. When the server searches for code change items in the database according to the code change date, it can be searched according to a specific date or according to a date range.

[0046] S15. Determine the code change branch where the changed code is located according to the code change project. The code change branch includes a release branch, a development branch, and a test branch.

[0047] The code branches corresponding to each project are pre-stored in the database. After the server finds the code change project, it can determine the corresponding code merge instructions and code change branches based on the code change project. The code change branches include the code that has been carried out, and the code change branches include release branches, development branches and test branches.

[0048] S16. Sending a code merging instruction corresponding to the code change project to the terminal, so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction.

[0049] The server determines the corresponding code merge instruction according to the code change project, and then sends the code merge instruction to the terminal. After receiving the code merge instruction, the terminal automatically merges the code change branch into the trunk branch.

[0050] The server of the present invention receives a code change query request sent by a terminal, the code change query request includes a code change date, and then the server finds the corresponding code change project in a database according to the code change date, determines the corresponding code merge instruction and the code change branch where the changed code is located according to the code change project, and then the server sends the code merge instruction to the terminal, and the terminal automatically merges the code change branch into the trunk branch according to the code merge instruction. After the server receives the code change query request, the present invention directly determines the code change branch where the changed code is located after finding the code change project, and the terminal automatically merges the code change branch into the trunk branch according to the code merge instruction sent by the server, without finding the changed code, only the code change branch needs to be obtained, and when merging, only the code change branch needs to be merged into the trunk branch, which greatly improves the efficiency of code merging and avoids the situations of missed merging and erroneous merging of manual code merging.

[0051] In one embodiment, after step S16, sending the code merging instruction corresponding to the code change project to the terminal so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction, the method further includes:

[0052] S17. Obtain the merge result of merging the code change branch into the main branch;

[0053] S18. Sending merge notification information including the merge result to the terminal.

[0054] After the terminal automatically merges the code change branch into the main branch according to the code merge instruction, the terminal also sends the merge result of the code change branch into the main branch to the server. After obtaining the merge result, the server sends the merge notification information containing the merge result to the terminal, which can be sent to the terminal in the form of an email. The merge notification information also includes corresponding project information, so as to facilitate notifying developers of the merge result.

[0055] In one embodiment, the code change query request sent by the receiving terminal in step S13 is:

[0056] A code change query request sent by a terminal is received according to a first preset time.

[0057] In order to further improve the efficiency of code merging, the terminal periodically sends a code change query request to the server. Therefore, the server receives the code change query request sent from the terminal according to the first preset time. For example, the terminal sends a code change query request every 1 hour, and the first preset time is to receive the code change query request every 1 hour.

[0058] In one embodiment, the automatic code merging method further includes:

[0059] S10, receiving a project change query request sent by a terminal, where the project change query request includes a project change date;

[0060] S11. Find the corresponding changed project in the database according to the project change query date.

[0061] The server receives a project change query request sent by the terminal to query whether there is a project with a code change, wherein the project change query request includes the project change date. The server searches the database for the corresponding changed project based on the project change query request. For example, if the shopping cart has interface information modified, then after receiving the project change query request, the server can find the shopping cart as a changed project in the database.

[0062] In one embodiment, in step S10, the project change query request sent by the receiving terminal is:

[0063] The project change query request sent by the terminal is received according to the second preset time.

[0064] In order to further improve the query efficiency of project changes, the terminal periodically sends a project change query request to the server. Therefore, the server receives the project change query request sent from the terminal according to the second preset time. For example, the terminal sends a project change query request every 0.5 hours, and the second preset time is to receive the project change query request every 0.5 hours.

[0065] In one embodiment, before step S13, receiving the code change query request sent by the terminal, the method further includes:

[0066] S12: Send change notification information including project change information to the terminal, and the terminal sends a code change query request after receiving the change notification information.

[0067] In this embodiment, the change notification message includes whether there is a project change. The server sends the change notification information containing the project change information to the terminal, which can be sent in the form of an email. After receiving the change notification information, the terminal sends a code change query request to the server. After receiving the code change query request, the server queries the code change project in the database. For example, the server queries that there is a related code change in the shopping cart in the project. Therefore, the code change information of the shopping cart is sent to the terminal. After receiving the code change information, the terminal sends a code change request to the server. The code change query request is further triggered when the terminal receives that there is a project change, so that after the new version of the software is released, the terminal can know the release of the new version of the software in a shorter time, and send the code change query request to the server at the terminal. The server finds the code change project in the database according to the code change date, and then determines the code change branch, and sends a code merge instruction to the terminal, so that the terminal merges the branch to be changed into the trunk branch according to the code merge instruction.

[0068] In one embodiment, the code change project includes a code change domain name, and the code change domain name stores a corresponding code change branch and a code merge instruction, wherein the step of determining the code change branch where the change code is located according to the code change project is:

[0069] Find the corresponding code change domain name according to the code change project, and determine the code change branch where the changed code is located according to the code change domain name;

[0070] Steps to send the code merge instruction corresponding to the code change project to the terminal are:

[0071] Determine the corresponding code merging instruction according to the code change domain name, and send the code merging instruction to the terminal.

[0072] Each project developed in the software includes multiple domain names, and the domain is the minimum granularity of the project. For example, the shopping cart project includes the interface information domain name of the front end, the number of each product in the shopping cart, and some interface information domain names of the back end. Each domain name corresponds to multiple code branches, such as development branches, release branches, and test branches. When the developer modifies the code, the modified code is stored under the code branch, and the corresponding code branch is found through the domain name. In the present invention, by storing the code merging instructions and the code change branch under the code change domain name, after the code change project is found at the server, the code change domain name can be found according to the domain name corresponding to the project, thereby determining the code change branch and the corresponding code merging instructions, and sending the code merging instructions to the terminal, instructing the terminal to directly merge the code change branch automatically into the trunk branch, without further finding the code, the code can be merged, saving labor costs and greatly improving the efficiency of code merging.

[0073] In a preferred embodiment, if Figure 2 As shown, the automatic code merging method includes the following steps:

[0074] S20, receiving a project change query request sent by a terminal, where the project change query request includes a project change date;

[0075] S21. Find the corresponding changed project in the database according to the project change query request;

[0076] S22, sending change notification information including project change information to the terminal;

[0077] S23, receiving a code change query request sent by the terminal, where the code change query request includes a code change date;

[0078] S24, searching the database for the corresponding code change item according to the code change date;

[0079] S25. Determine the code change branch where the changed code is located according to the code change project;

[0080] S26, sending a code merging instruction corresponding to the changed project to the terminal, so that the terminal automatically merges the code changed branch into the trunk branch according to the code merging instruction;

[0081] S27. Obtain the merge result of merging the code change branch into the main branch;

[0082] S28. Sending merge notification information including the merge result to the terminal.

[0083] In this embodiment, a project query change request is first sent to the server according to the terminal. The server finds the corresponding change project in the database according to the project change query request, and then sends the change notification information containing the project change information to the terminal. Then, the terminal sends a code change query request to the server, so that after the project is released, the developer can obtain the project information of the software update in time. Then, the server finds the corresponding code change project in the database according to the code change date, determines the code change branch where the change code is located according to the code change project, and sends the code merge instruction corresponding to the change project to the terminal. The terminal automatically merges the code change branch into the trunk branch according to the code merge instruction, thereby completing the automatic merging process of the code. The developer does not need to merge the code, which improves the efficiency of the code merging. Finally, the server obtains the merge result of the code change branch into the trunk branch, and sends the merge notification information containing the merge result to the terminal, thereby notifying the developer of the result of the code merge in time.

[0084] It should be understood that although Figure 1 and Figure 2 The steps in the flowchart are shown in sequence according to the arrows, but these steps are not necessarily performed in the order indicated by the arrows. Unless otherwise specified in this document, there is no strict order restriction for the execution of these steps, and these steps can be performed in other orders.

[0085] In order to facilitate understanding of the present invention, taking the operation of Jenkins merging the release branch into the trunk branch as an example, the technical solution of the present invention is implemented by the following method:

[0086] Before the terminal sends a code change query request to the server, build a trigger in Jenkins to build Job1, configure the ID token to trigger automatically, and use this trigger to automatically merge the code change branch after the terminal receives the code merge instruction. Then configure the script to execute the merge code, pull out the release branch through git checkout${Git Branch}, pull out the main branch through git checkout origin / master-b master, and merge the release branch into the main branch through gitmerge${GitBranch}.

[0087] In Jenkins, configure a script to call the query Release email module interface to build Job2. Through this script, the terminal is triggered to send project change query requests to the server at regular intervals, and the server notifies the terminal by email after querying the project with code changes. The content of the email includes information such as project ID, module name, release date, and corresponding developers.

[0088] After the terminal receives the notification message of the project change, a script that calls the merge interface Job3 is configured in Jenkins. Through this script, the terminal is triggered to send a code change query request to the server.

[0089] After receiving the code change query request, the server queries according to the code change date in the code change query request, finds the corresponding code change project in the database, determines the code change branch according to the code change project, and sends the code merge instruction corresponding to the code change project to the terminal.

[0090] After the terminal receives the code merge instruction, Job1 is automatically triggered to merge the release branch into the trunk branch.

[0091] Of course, there are other types of merging tools that can implement the technical solution of the present invention, such as TorosiseSVN, etc. As long as the above-mentioned method of automatic code merging can be implemented, they are all within the protection scope of the present invention.

[0092] In summary, after the present invention receives the code change query request through the server and finds the code change project, it directly determines the code change branch where the changed code is located, and the terminal automatically merges the code change branch into the trunk branch according to the merge instruction sent by the server. There is no need to find the changed code, only the code change branch needs to be obtained, and when merging, only the code change branch needs to be merged into the trunk branch, which greatly improves the efficiency of code merging; the code change query request is triggered in time after the terminal receives the project change, so that after the new version of the software is released, the terminal can know the release of the new version of the software in a shorter time, and send the code change query request to the server at the terminal; by storing the code merge instruction and the code change branch under the code change domain name, after the code change project is found at the server, the code change domain name can be found according to the domain name corresponding to the project, thereby determining the code change branch and the corresponding code merge instruction, and sending the code merge instruction to the terminal, instructing the terminal to automatically merge the code change branch directly into the trunk branch, and the code can be merged without further finding the code.

[0093] Embodiment 2

[0094] like Figure 3 As shown, a code automatic merging device is provided, the device comprising:

[0095] A receiving module, configured to receive a code change query request sent by a terminal, wherein the code change query request includes a code change date;

[0096] A code change project determination module, used to find the corresponding code change project in the database according to the code change date;

[0097] A code change branch determination module, used to determine the code change branch where the changed code is located according to the code change project, wherein the code change branch includes a release branch, a development branch, and a test branch;

[0098] The code merging instruction sending module is used to send the merging instruction corresponding to the code change project to the terminal, and the terminal automatically merges the code change branch into the trunk branch according to the merging instruction.

[0099] In one embodiment, it also includes: a merge notification information sending module, which is used to obtain the merge result of merging the code change branch into the trunk branch; and send the merge notification information containing the merge result to the terminal.

[0100] In one embodiment, the receiving module is further configured to receive a code change query request sent by a terminal according to a first preset time.

[0101] In one embodiment, it also includes: a project change query request receiving module for receiving a project change query request sent by a terminal, the project change query request including a project change date; and a change project determining module for finding a corresponding change project in a database according to the project change query request.

[0102] In one embodiment, the project change query request receiving module is further configured to receive a project change query request sent by a terminal according to a second preset time.

[0103] In one embodiment, the change notification information sending module is used to send the change notification information including the project change information to the terminal, and the terminal sends a code change query request after receiving the change notification information.

[0104] In one embodiment, the code change project includes a code change domain name, under which code change branches and corresponding code merge instructions are stored. The code change branch determination module is also used to find the corresponding code change domain name according to the code change project, and obtain the code change branch where the change code is located according to the code change domain name; the code merge instruction sending module is also used to send the corresponding code merge instruction obtained according to the code change domain name to the terminal.

[0105] For the specific definition of the automatic code merging device, please refer to the definition of the automatic code merging method above, which will not be repeated here. The various modules in the above-mentioned automatic code merging device can be implemented in whole or in part by software, hardware and a combination thereof. The above-mentioned modules can be embedded in or independent of the processor in the computer device in the form of hardware, or can be stored in the memory of the computer device in the form of software, so that the processor can call and execute the operations corresponding to the above modules.

[0106] Embodiment 3

[0107] In this embodiment, a computer device is provided, which may be a server. The computer device includes a processor, a memory and a network interface connected via a system bus. The processor of the computer device is used to provide computing and control capabilities. The memory of the computer device includes a non-volatile storage medium and an internal memory. The non-volatile storage medium stores an operating system, a computer program and a database. The internal memory provides an environment for the operation of the operating system and the computer program in the non-volatile storage medium. The network interface of the computer device is used to communicate with an external terminal via a network connection. When the computer program is executed by the processor, a method for automatic code merging is implemented.

[0108] In one embodiment, a computer device is provided, including a memory and a processor, wherein a computer program is stored in the memory, and when the processor executes the computer program, a method for automatic code merging as described in the embodiment is implemented. The execution process of the method and the technical effects that can be achieved are described in the first embodiment, and will not be repeated here.

[0109] Embodiment 4

[0110] In one embodiment, a computer-readable storage medium is provided, on which a computer program is stored. When the computer program is executed by a processor, a method for automatic code merging as in the embodiment is implemented. The execution process of the method and the technical effects that can be achieved are described in the first embodiment, and will not be repeated here.

[0111] Those of ordinary skill in the art can understand that all or part of the processes in the above-mentioned embodiment methods can be completed by instructing the relevant hardware through a computer program, and the computer program can be stored in a non-volatile computer-readable storage medium. When the computer program is executed, it can include the processes of the embodiments of the above-mentioned methods. Among them, any reference to memory, storage, database or other media used in the embodiments provided by the present invention can include at least one of non-volatile and volatile memory. Non-volatile memory can include read-only memory (ROM), magnetic tape, floppy disk, flash memory or optical memory, etc. Volatile memory can include random access memory (RAM) or external cache memory. As an illustration and not limitation, RAM can be in various forms, such as static random access memory (SRAM) or dynamic random access memory (DRAM).

[0112] The technical features of the above embodiments may be combined arbitrarily. To make the description concise, not all possible combinations of the technical features in the above embodiments are described. However, as long as there is no contradiction in the combination of these technical features, they should be considered to be within the scope of this specification.

[0113] The above-mentioned embodiments only express several implementation methods of the present invention, and the descriptions thereof are relatively specific and detailed, but they cannot be understood as limiting the scope of the invention patent. It should be pointed out that, for ordinary technicians in this field, several variations and improvements can be made without departing from the concept of the present invention, and these all belong to the protection scope of the present invention. Therefore, the protection scope of the patent of the present invention shall be subject to the attached claims.

Claims

1. A method for automatic code merging, characterized in that: Applied to a server, the method comprises: receiving a code change query request sent by a terminal, wherein the code change query request includes a code change date; According to the code change date, the corresponding code change item is found in the database; Determine the code change branch where the changed code is located according to the code change project, wherein the code change branch includes a release branch, a development branch, and a test branch; The code merging instruction corresponding to the code change project is sent to the terminal, so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction.

2. The method according to claim 1, characterized in that After the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction, the terminal further includes: Obtaining a merge result of the code change branch into the main branch; Sending merge notification information including the merge result to the terminal.

3. The method according to claim 1 or 2, characterized in that The code change query request sent by the receiving terminal is: A code change query request sent by the terminal is received according to a first preset time.

4. The method according to claim 1 or 2, characterized in that: The method further comprises: receiving a project change query request sent by the terminal, wherein the project change query request includes a project change date; The corresponding changed project is found in the database according to the project change query date.

5. The method according to claim 4, characterized in that The project change query request sent by the receiving terminal is: A project change query request sent by the terminal is received according to a second preset time.

6. The method according to claim 4, characterized in that The code change query request sent by the receiving terminal also includes: The change notification information including the project change information is sent to the terminal, and the terminal sends the code change query request after receiving the change notification information.

7. The method according to claim 1, characterized in that The code change project includes a code change domain name, under which corresponding code change branches and code merge instructions are stored, wherein the step of determining the code change branch where the change code is located according to the code change project is: Find the corresponding code change domain name according to the code change project, and determine the code change branch where the changed code is located according to the code change domain name; Steps to send the code merge instruction corresponding to the code change project to the terminal are: A corresponding code merging instruction is determined according to the code change domain name, and the code merging instruction is sent to the terminal.

8. A code automatic merging device, characterized in that: The device comprises: A receiving module, configured to receive a code change query request sent by a terminal, wherein the code change query request includes a code change date; A code change project determination module, used to find the corresponding code change project in the database according to the code change date; A code change branch determination module, used to determine the code change branch where the changed code is located according to the code change project, wherein the code change branch includes a release branch, a development branch, and a test branch; The code merging instruction sending module is used to send the code merging instruction corresponding to the code change project to the terminal, so that the terminal automatically merges the code change branch into the trunk branch according to the code merging instruction.

9. A computer device comprising a memory and a processor, wherein the memory stores a computer program, wherein: When the processor executes the computer program, the steps of the method according to any one of claims 1 to 7 are implemented.

10. A computer-readable storage medium having a computer program stored thereon, characterized in that: When the computer program is executed by a processor, the steps of the method according to any one of claims 1 to 7 are implemented.

Images