CN105468373A - Branch merging method and device - Google Patents
Branch merging method and device Download PDFInfo
- Publication number
- CN105468373A CN105468373A CN201510821252.5A CN201510821252A CN105468373A CN 105468373 A CN105468373 A CN 105468373A CN 201510821252 A CN201510821252 A CN 201510821252A CN 105468373 A CN105468373 A CN 105468373A
- Authority
- CN
- China
- Prior art keywords
- branch
- merging
- redaction
- version repository
- function
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Pending
Links
Classifications
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F8/00—Arrangements for software engineering
- G06F8/70—Software maintenance or management
- G06F8/71—Version control; Configuration management
Landscapes
- Engineering & Computer Science (AREA)
- Software Systems (AREA)
- General Engineering & Computer Science (AREA)
- Theoretical Computer Science (AREA)
- Computer Security & Cryptography (AREA)
- Physics & Mathematics (AREA)
- General Physics & Mathematics (AREA)
- Stored Programmes (AREA)
Abstract
The invention discloses a branch merging method and device. The branch merging method comprises the following steps: carrying out branch detection on a central version repository of a SVN (Subversion) server side of a version control system, judging whether the branch of a new version is uploaded into the central version repository or not, calling a preset branch merging function if the branch of the new version is uploaded into the central version repository, and carrying out a merging operation on the branch of the version and a branch appointed in advance by the branch merging function. When branch merging is carried out, a user does not need to appoint the branch to be merged so as to reduce the workload of the user, branch merging logic is packaged into a function in advance, the branch merging function is directly called during the branch merging to realize automatic merging, a SVN operation command does not need to be manually input by the user, a branch merging process is simplified, and the workload of the user is further reduced.
Description
Technical field
The application relates to technical field of software development, more particularly, relates to a kind of branch's merging method and device.
Background technology
SVN (abbreviation of Subversion) is the version control system of an open source code.Developer generally uses it to carry out code administration.Branch is the file directory one by one under SVN server end central authorities version repository.
In software development process, often need multiple person cooperational software is developed, a lot of team simultaneously have selected SVN to carry out code administration.The code that this locality writes can be submitted in central version repository by everyone, and central version repository by increasing the operation of version, retain the difference of each edition code, facilitating developer to analyze and rollback code.Usually, development teams according to product demand, can create multiple branch and is developed by different people, finally just develops branch and is merged into trunk, or two exploitation branches is merged.
Prior art needs user to specify the branch that will merge when carrying out branch's merging, and realizes branch's merging by inputting a large amount of SVN operational orders, and merge complexity high, workload is large.
Summary of the invention
In view of this, this application provides a kind of branch's merging method and device, high for the merging complexity solved existing for the merging of existing branch, the problem that workload is large.
To achieve these goals, the existing scheme proposed is as follows:
A kind of branch merging method, comprising:
Branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
When determining to upload the branch of redaction in described central version repository, call preset branch's pooled function;
Utilize described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.
Preferably, described when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function, comprising:
Judge whether the number of the branch of the redaction uploaded in described central version repository reaches preset number, if so, then call preset branch's pooled function.
Preferably, also comprise:
Receive branch's mark of several branches to be combined that user specifies, described branch mark is for marking the memory location of each branch to be combined in described central version repository;
Search in described central version repository and identify corresponding branch to be combined with branch described in each;
Read described preset branch's pooled function, utilize described branch pooled function to perform union operation to described branch to be combined.
Preferably, also comprise:
Detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
Preferably, also comprise:
Merging failure is informed to and specifies developer.
A kind of branch merges device, comprising:
Branch detection unit, for carrying out branch detection to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Function calling cell, for when determining to upload the branch of redaction in described central version repository, calls preset branch's pooled function;
First union operation unit, for utilizing described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.
Preferably, described function calling cell comprises:
First function call subelement, whether the number for the branch judging the redaction uploaded in described central version repository reaches preset number, if so, then calls preset branch's pooled function.
Preferably, also comprise:
User data receiving element, for receiving branch's mark of several branches to be combined that user specifies, described branch mark is for marking the memory location of each branch to be combined in described central version repository;
Unit is searched by branch, identifies corresponding branch to be combined for searching in described central version repository with branch described in each;
Second union operation unit, for reading described preset branch's pooled function, utilizes described branch pooled function to perform union operation to described branch to be combined.
Preferably, also comprise:
Branch's rollback unit, for detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
Preferably, also comprise:
Message informing unit, specifies developer for merging failure being informed to.
As can be seen from above-mentioned technical scheme, branch's merging method that the embodiment of the present application provides, by carrying out branch detection to the central version repository of version control system SVN server end, thus judge the branch whether uploading redaction in central version repository, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function, utilize described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.The application does not need user to specify branch to be combined when carrying out branch's merging, decrease amount of user effort, and in advance branch is merged logical wrapper and become function, directly call branch's pooled function when branch merges and can realize robotization merging, SVN operational order is manually inputted without the need to user, simplify branch's merging process, also reduce amount of user effort further.
Accompanying drawing explanation
In order to be illustrated more clearly in the embodiment of the present application or technical scheme of the prior art, be briefly described to the accompanying drawing used required in embodiment or description of the prior art below, apparently, accompanying drawing in the following describes is only the embodiment of the application, for those of ordinary skill in the art, under the prerequisite not paying creative work, other accompanying drawing can also be obtained according to the accompanying drawing provided.
Fig. 1 a kind of branch disclosed in the embodiment of the present application merges method flow diagram;
Fig. 2 another kind of branch disclosed in the embodiment of the present application merges method flow diagram;
Fig. 3 is that the embodiment of the present application another branch disclosed merges method flow diagram;
Fig. 4 is that the embodiment of the present application another branch disclosed merges method flow diagram;
Fig. 5 a kind of branch disclosed in the embodiment of the present application merges apparatus structure schematic diagram;
Fig. 6 is a kind of function calling cell structural representation disclosed in the embodiment of the present application;
Fig. 7 another kind of branch disclosed in the embodiment of the present application merges apparatus structure schematic diagram;
Fig. 8 is that the embodiment of the present application another branch disclosed merges apparatus structure schematic diagram;
Fig. 9 is that the embodiment of the present application another branch disclosed merges apparatus structure schematic diagram.
Embodiment
Below in conjunction with the accompanying drawing in the embodiment of the present application, be clearly and completely described the technical scheme in the embodiment of the present application, obviously, described embodiment is only some embodiments of the present application, instead of whole embodiments.Based on the embodiment in the application, those of ordinary skill in the art are not making the every other embodiment obtained under creative work prerequisite, all belong to the scope of the application's protection.
This application provides a kind of branch Merge Scenarios, under the program can be applied to Windows operating system and (SuSE) Linux OS, solve the problem that existing branch union operation is merely able to perform under Windows operating system, and be optimized improvement by merging mode to branch, solve some shortcomings that existing branch merges, being described in detail as follows of relevant the application branch Merge Scenarios.
Method flow diagram is merged see Fig. 1, Fig. 1 a kind of branch disclosed in the embodiment of the present application.
As shown in Figure 1, the method comprises:
Step S100, branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Particularly, branch can upload in the central version repository of SVN by user after terminal local writes branch code, and central version repository is that the branch newly uploaded adds new version number.
In this step, by traveling through central version repository, search the branch that whether there is redaction.
Step S110, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function;
Particularly, the application devises branch's pooled function in advance, also merges logical wrapper in a function by branch.Branch's robotization merging can be realized by calling this branch's pooled function.
Optionally, branch's pooled function can write in shell script in advance.
Step S120, utilize described branch pooled function, union operation is performed to the branch of described redaction and preassigned branch.
Particularly, when merging branch, redaction branch and preassigned branch can be selected to merge.Preassigned branch can be trunk, also can be other certain branch.
Branch's merging method that the embodiment of the present application provides, by carrying out branch detection to the central version repository of version control system SVN server end, thus judge the branch whether uploading redaction in central version repository, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function, utilize described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.The application does not need user to specify branch to be combined when carrying out branch's merging, decrease amount of user effort, and in advance branch is merged logical wrapper and become function, directly call branch's pooled function when branch merges and can realize robotization merging, SVN operational order is manually inputted without the need to user, simplify branch's merging process, also reduce amount of user effort further.
Branch's merging method of above-mentioned introduction, can be by disposing Hooks (hook) program at SVN server end in the specific implementation, this program be used for detect in central version repository uploaded redaction branch time, call preset branch pooled function, union operation is carried out to redaction branch and assigned finger.
Method flow diagram is merged see Fig. 2, Fig. 2 another kind of branch disclosed in the embodiment of the present application.
As shown in Figure 2, the method comprises:
Step S200, branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Particularly, branch can upload in the central version repository of SVN by user after terminal local writes branch code, and central version repository is that the branch newly uploaded adds new version number.
In this step, by traveling through central version repository, search the branch that whether there is redaction.
Step S110, judge whether the number of the branch of the redaction uploaded in described central version repository reaches preset number, if so, then call preset branch's pooled function;
Particularly, number can be pre-set in the application and limit, and then judge whether the number of branch of the redaction uploaded in central version repository reaches preset number, just calling preset branch pooled function, performing following branch union operation when reaching preset number.
Preset number can regulate setting by user.The application just starts subsequent branches union operation when determining that redaction branch number reaches some, carries out branch's merging to multiple redaction branch, saves branch and merges flow process.
Step S120, utilize described branch pooled function, union operation is performed to the branch of described redaction and preassigned branch.
Particularly, if above-mentioned preset number is multiple, then the number of carrying out the branch of the redaction of branch's merging herein, also for multiple, can carry out union operation to multiple redaction branch successively.
Compared to a upper embodiment, in the present embodiment when determining that the number of redaction branch in central version repository reaches preset number, just starting subsequent branches union operation, saving branch and merging flow process.
Be that the embodiment of the present application another branch disclosed merges method flow diagram see Fig. 3, Fig. 3.
As shown in Figure 3, the method comprises:
Step S300, branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Particularly, branch can upload in the central version repository of SVN by user after terminal local writes branch code, and central version repository is that the branch newly uploaded adds new version number.
In this step, by traveling through central version repository, search the branch that whether there is redaction.
Step S310, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function;
Particularly, the application devises branch's pooled function in advance, also merges logical wrapper in a function by branch.Branch's robotization merging can be realized by calling this branch's pooled function.
Step S320, utilize described branch pooled function, union operation is performed to the branch of described redaction and preassigned branch;
Branch's mark of several branches to be combined that step S330, reception user specify;
Particularly, described branch mark is for marking the memory location of each branch to be combined in described central version repository.Branch's mark can be the title of branch or branch's memory address etc.
Step S340, search in described central version repository and identify corresponding branch to be combined with branch described in each;
Particularly, utilize branch to be identified in central version repository and inquire about corresponding branch to be combined.The number of branch to be combined is generally two or more.
Step S350, read described preset branch's pooled function, utilize described branch pooled function to perform union operation to described branch to be combined.
Particularly, for the branch to be combined found, branch's pooled function is utilized to carry out branch's merging to it.
It should be noted that, if the branch to be combined that user specifies comprises trunk and other branch, then branch and trunk are merged; If the branch to be combined that user specifies is branch, then branch is merged.
There is provided user manually to carry out the interactive interface of branch's merging in the present embodiment further, interactive interface can show branch's mark of all branches in central version repository, select some branch as branch to be combined for user.Certainly, the interface of branch's mark that user can also be provided to input branch to be combined, to receive branch's mark of the branch to be combined of user's input.
After determining the branch to be combined that user specifies, by calling preset branch's pooled function, the branch to be combined user specified carries out branch's merging.
Be that the embodiment of the present application another branch disclosed merges method flow diagram see Fig. 4, Fig. 4.
As shown in Figure 4, the method comprises:
Step S400, branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Particularly, branch can upload in the central version repository of SVN by user after terminal local writes branch code, and central version repository is that the branch newly uploaded adds new version number.
In this step, by traveling through central version repository, search the branch that whether there is redaction.
Step S410, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function;
Particularly, the application devises branch's pooled function in advance, also merges logical wrapper in a function by branch.Branch's robotization merging can be realized by calling this branch's pooled function.
Step S420, utilize described branch pooled function, union operation is performed to the branch of described redaction and preassigned branch;
Step S430, detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
Particularly, the process that branch merges merges by the code in Liang Ge branch, in merging process, when the content of the n-th line of A branch and the n-th line of B branch is inconsistent, will produces conflict, cause branch to merge unsuccessfully.The failed branch of merging, when determining that branch merges unsuccessfully, is rolled back to the state before merging, so that next time merges again by the present embodiment.
Certainly, in order to reduce the generation of conflict, the application can also to arrange when branch merges unsuccessfully other countermeasure, such as detect merge unsuccessfully time, directly use the branch of described redaction, or described preassigned branch is as net result.
It should be noted that, above-described embodiment describes robotization when carrying out branch's merging, occurs strategy when merging unsuccessfully.Be understandable that, when user specifies branch to be combined, occur also can performing this strategy when merging unsuccessfully.
Further alternative, further merging failure can also be informed to the developer specified when branch merges unsuccessfully.Message informing mode can be the various Alternative Form such as mail, note.By informing that developer branch merges unsuccessfully, so that developer modifies to branch.
The branch provided the embodiment of the present application below merges device and is described, and branch described below merges device can mutual corresponding reference with above-described branch merging method.
Apparatus structure schematic diagram is merged see Fig. 5, Fig. 5 a kind of branch disclosed in the embodiment of the present application.
As shown in Figure 5, this device comprises:
Branch detection unit 51, for carrying out branch detection to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Function calling cell 52, for when determining to upload the branch of redaction in described central version repository, calls preset branch's pooled function;
First union operation unit 53, for utilizing described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.
The branch that the embodiment of the present application provides merges device, by carrying out branch detection to the central version repository of version control system SVN server end, thus judge the branch whether uploading redaction in central version repository, when determining to upload the branch of redaction in described central version repository, call preset branch's pooled function, utilize described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.The application does not need user to specify branch to be combined when carrying out branch's merging, decrease amount of user effort, and in advance branch is merged logical wrapper and become function, directly call branch's pooled function when branch merges and can realize robotization merging, SVN operational order is manually inputted without the need to user, simplify branch's merging process, also reduce amount of user effort further.
Optionally, the embodiment of the present application discloses the another kind of alternate configurations of above-mentioned function calling cell, and as shown in Figure 6, function calling cell 52 can comprise:
First function call subelement 521, whether the number for the branch judging the redaction uploaded in described central version repository reaches preset number, if so, then calls preset branch's pooled function.
Particularly, when determining that the number of redaction branch in central version repository reaches preset number, just starting subsequent branches union operation, saving branch and merging flow process.
Optionally, the embodiment of the present application discloses above-mentioned branch and merges the another kind of alternate configurations of device, composition graphs 5 and Fig. 7 known, branch merges device and can also comprise:
User data receiving element 54, for receiving branch's mark of several branches to be combined that user specifies, described branch mark is for marking the memory location of each branch to be combined in described central version repository;
Unit 55 is searched by branch, identifies corresponding branch to be combined for searching in described central version repository with branch described in each;
Second union operation unit 56, for reading described preset branch's pooled function, utilizes described branch pooled function to perform union operation to described branch to be combined.
The application provides user manually to carry out the interactive interface of branch's merging further, interactive interface can show branch's mark of all branches in central version repository, select some branch as branch to be combined for user.Certainly, the interface of branch's mark that user can also be provided to input branch to be combined, to receive branch's mark of the branch to be combined of user's input.
Optionally, the embodiment of the present application discloses above-mentioned branch and merges another alternate configurations of device, composition graphs 5 and Fig. 8 known, branch merges device and can also comprise:
Branch's rollback unit 57, for detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
Optionally, the embodiment of the present application discloses above-mentioned branch and merges another alternate configurations of device, composition graphs 8 and Fig. 9 known, branch merges device and can also comprise:
Message informing unit 58, specifies developer for merging failure being informed to.
Finally, also it should be noted that, in this article, the such as relational terms of first and second grades and so on is only used for an entity or operation to separate with another entity or operational zone, and not necessarily requires or imply the relation that there is any this reality between these entities or operation or sequentially.And, term " comprises ", " comprising " or its any other variant are intended to contain comprising of nonexcludability, thus make to comprise the process of a series of key element, method, article or equipment and not only comprise those key elements, but also comprise other key elements clearly do not listed, or also comprise by the intrinsic key element of this process, method, article or equipment.When not more restrictions, the key element limited by statement " comprising ... ", and be not precluded within process, method, article or the equipment comprising described key element and also there is other identical element.
In this instructions, each embodiment adopts the mode of going forward one by one to describe, and what each embodiment stressed is the difference with other embodiments, between each embodiment identical similar portion mutually see.
To the above-mentioned explanation of the disclosed embodiments, professional and technical personnel in the field are realized or uses the application.To be apparent for those skilled in the art to the multiple amendment of these embodiments, General Principle as defined herein when not departing from the spirit or scope of the application, can realize in other embodiments.Therefore, the application can not be restricted to these embodiments shown in this article, but will meet the widest scope consistent with principle disclosed herein and features of novelty.
Claims (10)
1. branch's merging method, is characterized in that, comprising:
Branch detection is carried out to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
When determining to upload the branch of redaction in described central version repository, call preset branch's pooled function;
Utilize described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.
2. method according to claim 1, is characterized in that, described when determining to upload the branch of redaction in described central version repository, calls preset branch's pooled function, comprising:
Judge whether the number of the branch of the redaction uploaded in described central version repository reaches preset number, if so, then call preset branch's pooled function.
3. method according to claim 1, is characterized in that, also comprises:
Receive branch's mark of several branches to be combined that user specifies, described branch mark is for marking the memory location of each branch to be combined in described central version repository;
Search in described central version repository and identify corresponding branch to be combined with branch described in each;
Read described preset branch's pooled function, utilize described branch pooled function to perform union operation to described branch to be combined.
4. the method according to any one of claim 1-3, is characterized in that, also comprises:
Detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
5. method according to claim 4, is characterized in that, also comprises:
Merging failure is informed to and specifies developer.
6. branch merges a device, it is characterized in that, comprising:
Branch detection unit, for carrying out branch detection to the central version repository of version control system SVN server end, in order to judge the branch whether uploading redaction in central version repository;
Function calling cell, for when determining to upload the branch of redaction in described central version repository, calls preset branch's pooled function;
First union operation unit, for utilizing described branch pooled function, to branch and the preassigned branch execution union operation of described redaction.
7. device according to claim 6, is characterized in that, described function calling cell comprises:
First function call subelement, whether the number for the branch judging the redaction uploaded in described central version repository reaches preset number, if so, then calls preset branch's pooled function.
8. device according to claim 6, is characterized in that, also comprises:
User data receiving element, for receiving branch's mark of several branches to be combined that user specifies, described branch mark is for marking the memory location of each branch to be combined in described central version repository;
Unit is searched by branch, identifies corresponding branch to be combined for searching in described central version repository with branch described in each;
Second union operation unit, for reading described preset branch's pooled function, utilizes described branch pooled function to perform union operation to described branch to be combined.
9. the device according to any one of claim 6-8, is characterized in that, also comprises:
Branch's rollback unit, for detect merge unsuccessfully time, by merging failed branch roll back to the state before merging.
10. device according to claim 9, is characterized in that, also comprises:
Message informing unit, specifies developer for merging failure being informed to.
Priority Applications (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201510821252.5A CN105468373A (en) | 2015-11-23 | 2015-11-23 | Branch merging method and device |
Applications Claiming Priority (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201510821252.5A CN105468373A (en) | 2015-11-23 | 2015-11-23 | Branch merging method and device |
Publications (1)
| Publication Number | Publication Date |
|---|---|
| CN105468373A true CN105468373A (en) | 2016-04-06 |
Family
ID=55606116
Family Applications (1)
| Application Number | Title | Priority Date | Filing Date |
|---|---|---|---|
| CN201510821252.5A Pending CN105468373A (en) | 2015-11-23 | 2015-11-23 | Branch merging method and device |
Country Status (1)
| Country | Link |
|---|---|
| CN (1) | CN105468373A (en) |
Cited By (8)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN107818048A (en) * | 2017-10-25 | 2018-03-20 | 携程旅游网络技术（上海）有限公司 | The integrated detection method for quality of branch, device, electronic equipment, storage medium |
| CN108062232A (en) * | 2017-12-14 | 2018-05-22 | 上海钢联电子商务股份有限公司 | A kind of system and method for automatically creating branch |
| CN108984413A (en) * | 2018-07-24 | 2018-12-11 | 浙江数链科技有限公司 | Branch code management method and device |
| CN109271756A (en) * | 2017-07-14 | 2019-01-25 | 迈普通信技术股份有限公司 | Authority control method, device and server |
| CN110795100A (en) * | 2019-09-12 | 2020-02-14 | 连连银通电子支付有限公司 | Branch merging method and device |
| CN112308571A (en) * | 2019-07-15 | 2021-02-02 | 北京京东尚科信息技术有限公司 | Intelligent customer service response method and device, storage medium and electronic equipment |
| CN113626072A (en) * | 2021-10-12 | 2021-11-09 | 中国光大银行股份有限公司 | Processing method and device for branch merging conflict based on server side and electronic equipment |
| WO2023051832A1 (en) * | 2021-09-28 | 2023-04-06 | 山东程序元软件有限公司 | Method and apparatus for constructing composite function block, composite function block, and storage medium |
Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN101932999A (en) * | 2007-12-20 | 2010-12-29 | 汇丰技术股份有限公司 | Automated methods and systems for developing and deploying projects in parallel |
| CN102902558A (en) * | 2012-09-11 | 2013-01-30 | 新浪网技术(中国)有限公司 | Project script file updating system and method as well as script file merging method and device |
| US20140101637A1 (en) * | 2008-12-28 | 2014-04-10 | International Business Machines Corporation | Selective notifications according to merge distance for software version branches within a software configuration management system |
| CN104461578A (en) * | 2014-12-26 | 2015-03-25 | 广州唯品会信息科技有限公司 | Automatic code merging method and system |
-
2015
- 2015-11-23 CN CN201510821252.5A patent/CN105468373A/en active Pending
Patent Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN101932999A (en) * | 2007-12-20 | 2010-12-29 | 汇丰技术股份有限公司 | Automated methods and systems for developing and deploying projects in parallel |
| US20140101637A1 (en) * | 2008-12-28 | 2014-04-10 | International Business Machines Corporation | Selective notifications according to merge distance for software version branches within a software configuration management system |
| CN102902558A (en) * | 2012-09-11 | 2013-01-30 | 新浪网技术(中国)有限公司 | Project script file updating system and method as well as script file merging method and device |
| CN104461578A (en) * | 2014-12-26 | 2015-03-25 | 广州唯品会信息科技有限公司 | Automatic code merging method and system |
Cited By (11)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN109271756A (en) * | 2017-07-14 | 2019-01-25 | 迈普通信技术股份有限公司 | Authority control method, device and server |
| CN107818048A (en) * | 2017-10-25 | 2018-03-20 | 携程旅游网络技术（上海）有限公司 | The integrated detection method for quality of branch, device, electronic equipment, storage medium |
| CN107818048B (en) * | 2017-10-25 | 2020-06-05 | 携程旅游网络技术（上海）有限公司 | Computer code branch integrated quality inspection method and related equipment |
| CN108062232A (en) * | 2017-12-14 | 2018-05-22 | 上海钢联电子商务股份有限公司 | A kind of system and method for automatically creating branch |
| CN108984413A (en) * | 2018-07-24 | 2018-12-11 | 浙江数链科技有限公司 | Branch code management method and device |
| CN112308571A (en) * | 2019-07-15 | 2021-02-02 | 北京京东尚科信息技术有限公司 | Intelligent customer service response method and device, storage medium and electronic equipment |
| CN110795100A (en) * | 2019-09-12 | 2020-02-14 | 连连银通电子支付有限公司 | Branch merging method and device |
| CN110795100B (en) * | 2019-09-12 | 2023-11-03 | 连连银通电子支付有限公司 | Branch merging method and device |
| WO2023051832A1 (en) * | 2021-09-28 | 2023-04-06 | 山东程序元软件有限公司 | Method and apparatus for constructing composite function block, composite function block, and storage medium |
| CN113626072A (en) * | 2021-10-12 | 2021-11-09 | 中国光大银行股份有限公司 | Processing method and device for branch merging conflict based on server side and electronic equipment |
| CN113626072B (en) * | 2021-10-12 | 2022-01-04 | 中国光大银行股份有限公司 | Processing method and device for branch merging conflict based on server side and electronic equipment |
Similar Documents
| Publication | Publication Date | Title |
|---|---|---|
| CN105468373A (en) | Branch merging method and device | |
| CN109951547B (en) | Transaction request parallel processing method, device, equipment and medium | |
| US10346159B2 (en) | Systems and methods for software scanning tool | |
| CN108205560B (en) | Data synchronization method and device | |
| CN106371881A (en) | Method and system for updating program versions in servers | |
| CN109766139B (en) | Configuration method and device of configuration file | |
| US20150033210A1 (en) | Method and system for debugging a change-set | |
| CN105867962A (en) | System upgrading method and device | |
| CN110704122A (en) | Plug-in loading method and device | |
| CN106383755A (en) | Method, apparatus and system for recovering slave database from master-slave database system | |
| CN107193619B (en) | Method and device for automatically updating compiled version | |
| CN112445514B (en) | Code review method and related products | |
| CN106776775B (en) | Concurrent master-slave synchronization method and device | |
| CN109254791A (en) | Develop management method, computer readable storage medium and the terminal device of data | |
| US9015116B2 (en) | Consistent replication of transactional updates | |
| US10338891B2 (en) | Migration between model elements of different types in a modeling environment | |
| US20150286641A1 (en) | Enhanced batch updates on records and related records system and method | |
| CN109522174B (en) | Method, device, terminal and storage medium for controlling adb enabling | |
| CN109522217A (en) | The internal storage testing method and terminal device of application program | |
| CN113741931B (en) | Software upgrading method and device, electronic equipment and readable storage medium | |
| CN114936152A (en) | Application testing method and device | |
| US9477448B2 (en) | Screen-oriented computing program refactoring | |
| CN110290172B (en) | Container application cloning method and device, computer equipment and storage medium | |
| CN106484625A (en) | A kind of method based on universal test Software Development Platform test subsystems | |
| CN112541750A (en) | Data processing method, device, equipment and computer readable storage medium |
Legal Events
| Date | Code | Title | Description |
|---|---|---|---|
| C06 | Publication | ||
| PB01 | Publication | ||
| C10 | Entry into substantive examination | ||
| SE01 | Entry into force of request for substantive examination | ||
| RJ01 | Rejection of invention patent application after publication |
Application publication date: 20160406 |
|
| RJ01 | Rejection of invention patent application after publication |