CN108073501A

CN108073501A - A kind of code conflicts detection method and equipment

Info

Publication number: CN108073501A
Application number: CN201611001045.6A
Authority: CN
Inventors: 李兆伟; 许玲
Original assignee: Alibaba Group Holding Ltd
Current assignee: Alibaba Group Holding Ltd
Priority date: 2016-11-14
Filing date: 2016-11-14
Publication date: 2018-05-25
Anticipated expiration: 2036-11-14
Also published as: CN108073501B

Abstract

The purpose of the application is to provide a kind of curve generation method and equipment, whether the code that the application monitors Local work space by finger daemon is changed, when monitoring the coding change of the Local work space, corresponding change conflict record is generated, the conflict record includes the other codes changed post code and have dependence with the change post code；Then, the change post code and the other codes for having dependence with the change post code are merged and compiling obtains compiling result, then judge whether the compiling result has conflict, if there is conflict, workspace where then having other codes of dependence to the workspace where the change post code and with the change post code is simultaneously emitted by conflict notification, enable and the change post code and cooperateed with modification in time with change post code other codes for having dependence, not only reduce the workload of developer, also effectively improve co-development efficiency.

Description

A kind of code conflicts detection method and equipment

Technical field

This application involves computer realm more particularly to a kind of code conflicts detection methods and equipment.

Background technology

In the prior art, during technical team's co-development, since the personnel of development teams are relatively more, carrying The problem of being frequently encountered code conflicts when handing over code, such as developer P and developer M have modified some source document simultaneously Part has modified the source code for having call close-coupled relation between each other simultaneously, attempts to be submitted to remote warehouse at them When, it can prompt to solve to conflict, it is necessary to which developer carries out human intervention.Traditional co-development mode is different exploitations Person first pulls the newest code of exploitation branch from remote warehouse, it is necessary to again after area's exploitation completion corresponding function that works in this locality The update of branch's increment is pulled from remote warehouse, the area that works in this locality attempts automatic merging, and developer is prompted to solve conflict, such as The developer of fruit team is relatively more, and the coupling between module is higher, and mutual dependence is more, and developer can spend Take very big energy modification code and solve conflict, it is also possible to overthrow the code module for rewriteeing and having completed, the collaboration of mainstream is opened The automatic pooling function of hair instrument is nor especially perfect, and the code that will also result in mistake merges, these can all cause code Compile error and functional defect.

Traditional co-development mode as shown in Figure 1, developer P and developer M carry out co-development, while from long-range Warehouse pulls Source.java (code source file), and the function A included inside code source file enters to join a, code there are one The function B included inside source file has invoked function A (a)；Wherein, in the process of development, developer P has modified the ginseng of function A Number definition enters ginseng change a from 1 and enters to join a, b, c into 3, and the exploitation reality of function A is completed according to newest parameter definition Existing, at the same time developer M, which is being developed, realizes function B, and only having prepared 1 for call function A enters ginseng, he is not aware that exploitation Person P has had modified the parameter definition of function A, then, it is assumed that developer P pulls the function A newest generations of remote warehouse first Code incremental update simultaneously submits code to arrive local branch, final push code to remote warehouse, and developer M is from beginning in whole process To the whole notice for all not receiving the parameter definition of function A and having been changed, developer M is compiled also according to 1 structure for entering ginseng The program for writing function B is realized, when trial pulls the newest code incremental updates of function B of remote warehouse and submits code to locally During branch, developer M can run into conflict and compile error, and function B can not find only there are one the function A for entering ginseng, he must not It does not solve the function B that conflict change oneself has been carried out completing and provides more parameters for function A, at this time it is possible that real Existing module is developed again, and large effect is generated to development progress.It is similarly assumed that developer M pulls remote warehouse first The newest incremental updates of function B and submit code the final code that pushes be to remote warehouse, when developer P is complete to local branch Into after being realized to the modification of function A, when trial pulls the function B incremental updates of remote warehouse and submits code to local branch When, developer P can also run into conflict and compile error, and function B can not find only there are one the function A for entering ginseng, and developer P is not Not check developer M for function B code realize, and proactive notification he do corresponding coding change, equally to develop into Degree causes very big influence.

Therefore, by using traditional co-development mode, cause that the code of modification can not be predicted between each developer And the code of modification is correspondingly adjusted, cause co-development efficiency low and heavy workload.

Apply for content

The purpose of the application is to provide a kind of code conflicts detection method and equipment, solves to open using traditional collaboration Co-development efficiency caused by originating party formula is low and the problem of heavy workload.

According to the one side of the application, a kind of code conflicts detection method is provided, applied to where remote warehouse Server, this method include：

Whether the code of monitoring Local work space is changed, when monitoring the coding change of the Local work space, generation Corresponding change conflict record, the conflict record include changing post code and have its of dependence with the change post code Its code；

The change post code and the other codes for having dependence with the change post code are merged and compiled Compiled as a result, judge it is described compiling result whether have conflict, if there is conflict, to it is described change post code where workspace Send conflict notification.

Further, in the above method, whether the code of the monitoring Local work space is changed, including：

Whether the code that Local work space is monitored by finger daemon is changed.

Further, in the above method, the workspace to where the change post code sends conflict notification, wraps It includes：

According to the presentation stage residing for the change post code, difference is sent to the workspace where the change post code The conflict notification of rank.

Further, in the above method, the workspace to where the change post code sends the same of conflict notification When, it further includes：

Workspace where having other codes of dependence with the change post code, sends conflict notification.

Further, it is described where having other codes of dependence with the change post code in the above method Workspace sends conflict notification, including：

According to the presentation stage residing for the change post code, to the other generations for having dependence with the change post code Workspace where code sends the conflict notification of different stage.

Further, in the above method, it is described judge it is described compiling result whether have conflict after, further include：

If Lothrus apterus, the change conflict record is deleted.

Further, in the above method, after the workspace to where the change post code sends conflict notification, It further includes：

The feedback of the Conflict solving based on the conflict notification is received from the workspace where the change post code；

Corresponding change conflict record is deleted according to the feedback of the Conflict solving.

Check that the change conflict record whether there is every preset time,

If in the presence of, to it is described change post code where workspace send conflict notification again.

Further, in the above method, the workspace to where the change post code sends conflict notification again, Including：

According to the presentation stage residing for the change post code, sent again to the workspace where the change post code The conflict notification of different stage.

Further, in the above method, the workspace occurrence to where the change post code sends conflict notification While, it further includes：

Workspace where having other codes of dependence with the change post code, sends conflict notification again.

Further, it is described where having other codes of dependence with the change post code in the above method Workspace sends conflict notification again, including：

According to the presentation stage residing for the change post code, to the other generations for having dependence with the change post code Workspace where code sends the conflict notification of different stage again.

According to further aspect of the application, a kind of code conflicts detection device is provided, applied to where remote warehouse Server, the equipment includes：

Monitoring device, for monitoring whether the code of Local work space is changed, when the generation for monitoring the Local work space During frameshift alteration, generate it is corresponding change conflict record, it is described conflict record include change post code and with the change post code There are other codes of dependence；

Merge compilation device, for there are other generations of dependence by the change post code and with the change post code Code merges and compiling is compiled as a result, judging whether the compiling result has conflict, if there is conflict, after the change Workspace where code sends conflict notification.

Further, in above equipment, the monitoring device is used for：

Further, in above equipment, the merging compilation device is used for：

Further, in above equipment, the merging compilation device is additionally operable to：

Further, in above equipment, the merging compilation device is used for：

If Lothrus apterus, the change conflict record is deleted.

Check that the change conflict record whether there is every preset time,

Further, in above equipment, the merging compilation device is used for：

According to further aspect of the application, a kind of equipment based on calculating is additionally provided, including：

Processor；And

The memory of storage computer executable instructions is arranged to, the executable instruction makes the place when executed Manage device：

The application is by monitoring whether the code of Local work space is changed, when monitoring the code of the Local work space more When changing, generate it is corresponding change conflict record, it is described conflict record include change post code and with it is described change post code have according to The other codes for the relation of relying；Then, there are other codes of dependence by the change post code and with the change post code Merge and compiling compiled as a result, then judge it is described compiling result whether have conflict, if there is conflict, to it is described more Workspace where changing post code sends conflict notification, while to the other code institutes for having dependence with the change post code Workspace, send conflict notification so that it is described change post code where workspace and with it is described change post code have according to Workspace where the other codes for the relation of relying correspondingly is repaiied by the change post code clashed and other described codes Change and adjust, developer's modification change post code can not only be effectively saved and have dependence with the change post code The time of other codes of relation, also reduce has its of dependence to the change post code and with the change post code The code of its code rewrites workload, and then improves co-development efficiency.

Further, the application also by finger daemon monitor Local work space code whether change, can it is more convenient, Efficiently monitor whether the code of Local work space is changed in time.

Description of the drawings

By reading the detailed description made to non-limiting example made with reference to the following drawings, the application's is other Feature, objects and advantages will become more apparent upon：

Fig. 1 shows the flow chart of traditional co-development mode of existing scheme；

Fig. 2 shows the conflict center schematic diagram in a kind of code conflicts detection method according to the application one side；

Fig. 3 shows a kind of flow chart of code conflicts detection method according to the application one side；

Fig. 4 shows a kind of module diagram of code conflicts detection device according to the application one side.

The same or similar reference numeral represents the same or similar component in attached drawing.

Specific embodiment

The application is described in further detail below in conjunction with the accompanying drawings.

Local work space, local branch and the remote warehouse that the application needs are related to are briefly described first：

Local work space is mainly used for storing developer's code being developed, and is submitted to local branch not yet Code；

Local branch is mainly used for storing developer and has worked in this locality the code that area's exploitation is completed, and not yet It is submitted to the code of remote warehouse；

The remote warehouse is mainly used for storing the submitted code of all developers, the submitted generation Code is also the merging code latest edition after all developers submit simultaneously；

The Local work space and the local branch are in local development platform, and the remote warehouse is then In the long-range server for being used to store the submitted newest code of all developers；

Groundwork flow between Local work space, local branch and remote warehouse is：Developer is in the local Workspace exploitation code, code to be developed are committed to the local branch after finishing, can be real-time for the ease of all developers Each developer that obtains develop the code completed, therefore after code is committed to the local branch, will eventually submit Code after to the local branch is committed to the remote warehouse and is stored.

According to the one side of the application, a kind of code conflicts detection method is provided, applied to where remote warehouse Server, the server end where remote warehouse can actively shift to an earlier date monitoring code conflict, ensure to find code conflicts, institute in time Stating method includes step S1 and step S2.

Step S1, whether the code for monitoring Local work space is changed, when the coding change for monitoring the Local work space When, corresponding change conflict record is generated, the conflict record includes changing post code and has dependence with the change post code Other codes of relation.

In one embodiment of the application, before whether being changed by the code of step S1 monitorings Local work space, as shown in figure 3, It establishes finger daemon for the more exploitation branch of the developer in the technical team in collaborative development process and starts this and guard Process, on the one hand safeguards a change conflict list in the finger daemon, the change conflict list includes local work The code changed in area and other codes for having dependence therewith, another aspect, the change conflict center also dynamic A exploitation branch of maintenance corresponds to specific dependence between source code, so as to subsequently according to it is described change conflict list and Specific dependence detects the potential punching of identification by the finger daemon between corresponding exploitation branch corresponds to source code Prominent code, and generate corresponding change conflict list.

In one embodiment of the application, the finger daemon can be deployed in the server end where remote warehouse.

Then above-mentioned one embodiment of the application monitors the code of Local work space by the finger daemon in step sl Whether change is had, and the finger daemon, periodically please to the Local work space of each developer with cycle T by heartbeat mechanism Acquisition coding change is asked, corresponding request feedback information is returned to as shown in Fig. 2, institute to treat that the Local work space is based on the request Request feedback information is stated to show in the form of changing conflict record at the change conflict center；Wherein, the change conflict note Record can be embodied in a change conflict list and corresponding source code nesting allocation dependence, i.e., in the change conflict The code after change is recorded in list and there are other codes of dependence with the code after the change, the source code is nested Call dependence that can record the particular content of the dependence.

Then above-mentioned one embodiment of the application, when the step S1 monitors the local work by the finger daemon Area does not have code to be modified, then the request feedback information does not change response message for code；When monitoring the local work Area has code to be modified, then the request feedback information can include change post code, and the finger daemon is in the change punching Can generate corresponding change conflict record in prominent center, the change conflict record include it is described change post code and with it is described more Changing post code has other codes of dependence.

Illustrated below with specific embodiment, if such as change post code be function A, with it is described change post code have according to Other codes for the relation of relying are function B, after the code on function A for monitoring local branch is modified, are then rushed in change Prominent center has change post code (function A) and has other code (functions of dependence with the change post code (function A) B)；For another example, if change post code is function C, there are other codes of dependence for function D with the change post code, work as prison Measure local branch the code on function C be modified after, had at change conflict center change post code (function C) and with The change post code (function C) has other codes (function D) of dependence.Since function A and function C are changed, then with Other functions D that other functions B and and function C that function A has dependence have dependence is potential conflict code, therefore It is nested based on source code and calls dependence, identified potential conflict code, and generate corresponding change conflict list.

Local work space is monitored by the finger daemon in the step S1 in above-described embodiment of the application Whether code is changed to generate after corresponding change conflict record, the step S2, by the change post code and with it is described Other codes that change post code has dependence merge and compiling is compiled as a result, whether judging the compiling result There is conflict, if there is conflict, conflict notification is sent to the workspace where the change post code.

In one embodiment of the application, determine that the change conflict at the change conflict center records it in the step S1 Afterwards, the step S2 according to the change conflict record at change conflict center by the change post code and with the change post code The other codes for having dependence merge and compiling is compiled as a result, as shown in figure 3, taking developer P and exploitation The described of the workspace of person M is modified code (function A) and after and function A has other codes (function B) of dependence, by institute Other codes (function B) stated change post code (function A) and have dependence with the change post code pass through finger daemon It carries out and simultaneously (submits) and compile (code compilation) in advance to obtain compiling result.

In one embodiment of the application, in the step S2, after the compiling result is obtained, the step S2 will also judge Whether the compiling result has conflict, if if the compiling result has conflict, by the finger daemon to the change Workspace where post code (function A) sends conflict notification, and the punching can be based on the developer P for treating function A places workspace Prominent notice has corresponding function A and and function A the corresponding codes of the function B of dependence to carry out corresponding code revision and tune It is whole；Otherwise, if if the compiling result Lothrus apterus, the change conflict record can be deleted, post code (function will be changed A) and with other codes (function B) that the change post code (function A) has dependence deleted from the center that conflicts of changing, To realize the update at the change conflict center.

Whether above-described embodiment of the application is changed by the code for monitoring Local work space, can not only be as early as possible The potential code of discovery change conflict the problem of, and conflict notification prompting is carried out to associated developer in time, additionally it is possible to It is effectively saved developer's modification change post code and has other codes of dependence with the change post code Time, the code that reduce has other codes of dependence to the change post code and with the change post code rewrite work It measures, and then improves co-development efficiency；It is appreciated that the application can also monitor local work by the finger daemon Whether the code for making area is changed, and whether code that is more convenient, efficiently monitoring Local work space in time is changed.

In one embodiment of the application, the step S2 is when judging that obtaining the compiling result has conflict, to the change Workspace where post code sends conflict notification and is specifically as follows：According to it is described change post code residing for presentation stage, to Workspace where the change post code sends the conflict notification of different stage.

In one embodiment of the application, if the change post code (function A) works in this locality, area is changed and in local If workspace is submitted, the conflict notification of low level can be sent to the Local work space where function A, to remind function A places Local work space developer P, allow developer P can know in time the function A oneself changed be likely to affect with Function A have dependence function B, such developer P can workspace where and function B in time responsible developer M It carries out co-development to reach an agreement, realizes co-development of the area to function A and function B that work in this locality, avoid function A and function B generates conflict when merging compiling.

In one embodiment of the application, if the change post code (function A) works in this locality, area is changed and in local If branch is submitted, high level conflict notification can be sent to the workspace where function A, to remind the sheet where function A The developer P of ground workspace allows developer P to know that the function A oneself changed influences whether that and function A has dependence The rewriting of function B, even function B, such developer P can the responsible developer M of promptly workspace where and function B carry out Co-development is reached an agreement, and before remote warehouse is committed to, which is fallen by the change post code (function A), The emergency of conflict is embodied, in order to avoid cause more cumbersome code rewriting.

In one embodiment of the application, the step S2 judge obtain it is described compiling result have conflict when, to it is described more While workspace where changing post code sends conflict notification, further include：There is dependence to the change post code Workspace where other codes, sends conflict notification.

In one embodiment of the application, if the change post code (function A) works in this locality what area was changed and submitted Words can send conflict notification to the Local work space where function A, and conflict notification is being sent out to the Local work space where function A While, also conflict notification can be sent as the workspace where other codes (function B) of dependence to and function A, to treat The developer M of the workspace of function B carries out confirming that function A has been changed as early as possible with developer P based on the conflict notification, and mutually Reach that co-development is consistent, in case influencing the and function A that developer M is being developed has other code (letters of dependence Number B) do over again, can not only be effectively saved developer P and developer M modification it is described change post code and with after the change Code has the time of other codes of dependence, also reduce to it is described change post code and with it is described change post code have according to The code of the other codes for the relation of relying rewrites workload, and then improves co-development efficiency.

In one embodiment of the application, the step S2 judge obtain it is described compiling result have conflict when, to it is described more Workspace where changing post code and having other codes of dependence sends conflict notification and is specially：According to the change post code Residing presentation stage sends different stage to the workspace where having other codes of dependence with the change post code Conflict notification, illustrated below with specific embodiment：

In one embodiment of the application, if the change post code (function A) has other codes (function B) of dependence Work in this locality area changed and work in this locality area submit if, can to where function B Local work space send low level Conflict notification, to remind the developer M of the Local work space where function B, allow developer M that can know that oneself is being repaiied in time The function B changed is likely to affect has the function A, such developer M of dependence can and function A institutes in time with rising Responsible developer P in workspace carries out co-development and reaches an agreement, and realizes association of the area to function A and function B that work in this locality With exploitation, function A and function B is avoided to generate conflict when merging compiling；If there is dependence with the change post code (function A) Other codes (function B) area that works in this locality changed and if being submitted in local branch, can be to the sheet where function B Ground workspace sends high level conflict notification, to remind the developer M of the Local work space where function B, developer M is allowed to know The function B that road oneself is being changed influences whether the function A for having dependence to it or even the rewriting for causing function A, so opens Originator M can be before remote warehouse be committed to by function B, and the developer P of workspace where and function A carries out coordinated development and reaches one Cause, such developer M can the modification based on the high level conflict notification and function A corresponding code adjustment is carried out to function B, Or modification corresponding codes to function B of the developer M based on function A is written over, to avoid the corresponding codes of function B Cause the one party in co-development that larger energy is spent to repair code or rewriting portion code after remote warehouse for being committed to.

In one embodiment of the application, the step S2 judge obtain it is described compiling result have conflict when, to it is described more After workspace where changing post code sends conflict notification, further include：It is received from the workspace where the change post code The feedback of Conflict solving based on the conflict notification；Corresponding change conflict note is deleted according to the feedback of the Conflict solving Record.

In one embodiment of the application, the developer P of the workspace where function A receive based on the conflict notification it Afterwards, corresponding solution is made that conflict, and Conflict solving is sent to the finger daemon of remote warehouse based on the solution of conflict Feedback is deleted the corresponding change conflict records of function A from change conflict center based on the feedback of the Conflict solving, to update Change conflict center is stated, the conflict solved is avoided and repeats unnecessary conflict judgement and repeat to make corresponding punching Prominent notice.

In one embodiment of the application, the step S2 is when judging that obtaining the compiling result has conflict, to the change After workspace where post code sends conflict notification, further include：Check that the change conflict record is every preset time No presence, if in the presence of, to it is described change post code where workspace send conflict notification again.

In one embodiment of the application, by the finger daemon to the work where the change post code (function A) After area sends conflict notification, in order to continue whether the workspace where monitoring function A is carried out based on the conflict notification received Corresponding modification checks whether the corresponding change conflict record of the conflict notification also has change punching every preset time △ T Prominent center, if in the presence of, then it represents that the corresponding conflict notification sent of change conflict record is not adopted in the workspace where function A Corresponding measure is taken to modify adjustment, needs to send again to the workspace where the change post code (function A) at this time Conflict notification, to treat the developer P of the workspace where function A based on the conflict notification sent again to corresponding function A It is changed accordingly, the present embodiment whether there is by constantly monitoring change conflict record in preset interval time section, only Exist, just illustrate conflict processing not yet between corresponding code, conflict notification again can be sent in time, until corresponding generation Code between clash handle complete, change conflict record deletion, so as to avoid the corresponding code for the conflict notification having been sent from it Between conflict and do not solve the problems, such as in time, ensure to conflict between each code to be effectively addressed.

In one embodiment of the application, the step S2 judge obtain it is described compiling result have conflict when, to it is described more Workspace where changing post code sends conflict notification again：According to it is described change post code residing for presentation stage, Send the conflict notification of different stage again to the workspace where the change post code.It is said below with specific embodiment It is bright：

In one embodiment of the application, after judging to show that the compiling result has conflict, and the change post code Workspace where (function A) there is no corresponding code revision is made based on the conflict notification, then can be according to the change after Presentation stage residing for code (function A), by finger daemon to the workspace where change post code (function A) again Conflict notification is sent, the developer P to remind the workspace where function A handles the conflict between corresponding code, Until solve the conflict between corresponding code, the area that achievees the purpose that work in this locality solves corresponding code conflicts, wherein,

If function A works in this locality, area can be sent rudimentary by modification and submission to the Local work space where function A Other conflict notification to remind the developer P of the workspace where function A, timely and function A to have the function B of dependence The developer M of the workspace at place carries out coordinated development and reaches an agreement, and solves the conflict between function A and function B；

If function A works in this locality, area is changed and if local branch is submitted, can be to the local work where function A Make area and send high level conflict notification, the developer P to remind the workspace where function A must be committed in function A Before remote warehouse, the Conflict solving between function A and functions B is fallen, to embody the emergency of the conflict, avoids causing more Code rewriting.

In one embodiment of the application, when the step S2 judges to obtain the compiling result and has conflict, after the change While workspace occurrence where code sends conflict notification, further include：There is dependence to the change post code Workspace where other codes, sends conflict notification again.It is illustrated below with specific embodiment：

In one embodiment of the application, after judging that obtaining the compiling result has conflict, and the change post code Workspace where (function A) there is no corresponding code revision is made based on the conflict notification, then can to after the change While workspace where code (function A) sends conflict notification again, there is dependence to the change post code (function A) Workspace where other codes (function B) of relation sends conflict notification again, to remind opening for the workspace where function B Originator M carries out confirming that function A has been changed as early as possible with developer P based on the conflict notification, while mutually reaches association with developer P It is consistent with exploitation, in case the and function A that influence developer M is being developed has other codes (function B) of dependence It does over again, the developer P and developer M modifications change post code can be effectively saved and has dependence with the change post code The time of other codes of relation, reduce has the other of dependence to the change post code and with the change post code The code of code rewrites workload, and then improves co-development efficiency.

In one embodiment of the application, when the step S2 judges to obtain the compiling result and has conflict, to the change Post code has the workspace where other codes of dependence, sends conflict notification again and is specifically as follows：According to it is described more Change the presentation stage residing for post code, the workspace where having other codes of dependence with the change post code, then The secondary conflict notification for sending different stage.It is illustrated below with specific embodiment：

In one embodiment of the application, after the compiling result has conflict, and described change post code (function A) institute Workspace there is no based on the conflict notification corresponding code revision is made, then can change post code (function to described A while the workspace where) sends conflict notification again, according to it is described change post code residing for stage, to and function A by The developer M of workspace where the function B of dependence sends conflict notification again, so that developer M and developer P is as early as possible Collaboration is reached an agreement, and realizes the corresponding modification to function A and function B, reaches the code punching solved between function A and functions B Prominent purpose ensures that each code conflicts can be handled timely and effectively, avoids function B and is being committed to remote warehouse Causing the developer P in collaborative development process afterwards, either developer M spends larger energy to repair code or rewriting portion generation Code.

According to further aspect of the application, a kind of code conflicts detection device is provided, applied to where remote warehouse Server, the server end where remote warehouse can actively shift to an earlier date monitoring code conflict, ensure to find code conflicts in time, As shown in figure 4, the equipment includes：Monitoring device 1 and merging compilation device 2, wherein,

The monitoring device 1 is used for：Whether the code of monitoring Local work space is changed, when monitoring the Local work space Coding change when, generate it is corresponding change conflict record, it is described conflict record include change post code and with after the change Code has other codes of dependence；

In one embodiment of the application, before whether being changed by the code of the monitoring device 1 monitoring Local work space, such as Shown in Fig. 3, establish finger daemon for the more exploitation branch of the developer in the technical team in collaborative development process and open The finger daemon is moved, a change conflict list is on the one hand safeguarded in the finger daemon, the change conflict list includes The code changed of Local work space and other codes for having dependence therewith, another aspect, in the change conflict The heart also dynamically safeguards that a exploitation branch corresponds to specific dependence between source code, subsequently to be rushed according to the change Specific dependence detects identification by the finger daemon between prominent list and corresponding exploitation branch correspond to source code Potential conflict code, and generate corresponding change conflict list.

Then above-mentioned one embodiment of the application monitors local work in the monitoring device 1 by the finger daemon Whether the code in area has change, and the finger daemon is by heartbeat mechanism, with cycle T periodically to the local of each developer Workspace acquisition request coding change returns to corresponding request feedback information, such as to treat that the Local work space is based on the request The request feedback information shown in Fig. 2 is showed at the change conflict center in the form of changing conflict record；Wherein, the change More conflict record can be embodied in a change conflict list and corresponding source code nesting allocation dependence, that is, have described The code after change is recorded in change conflict list and has other codes of dependence, the source with the code after the change Code nesting allocation dependence can record the particular content of the dependence.

Then above-mentioned one embodiment of the application, when the monitoring device 1 monitors the local by the finger daemon Workspace does not have code to be modified, then the request feedback information does not change response message for code；When monitoring the local Workspace has code to be modified, then the request feedback information can include change post code, and the finger daemon is in the change Can be generated in more conflict center it is corresponding change conflict record, it is described change conflict record include it is described change post code and with institute Stating change post code has other codes of dependence..Such as if change post code is function A, is had with the change post code Other codes of dependence are function B, after the code on function A for monitoring local branch is modified, are then being changed Conflict center has change post code (function A) and has other code (letters of dependence with the change post code (function A) Number B)；For another example, if change post code is function C, there are other codes of dependence with the change post code for function D, when After monitoring that the code on function C of local branch is modified, had at change conflict center change post code (function C) and There are other codes (function D) of dependence with the change post code (function C).Since function A and function C are changed, then Other functions D that other functions B and and function C that and function A has dependence have dependence is potential conflict code, Therefore be nested based on source code and call dependence, it identifies potential conflict code, and generates corresponding change conflict list.

Local work space is monitored by the finger daemon in the monitoring device 1 in above-described embodiment of the application Code whether change to generate after corresponding change conflict record, the merging compilation device 2 is used for：After the change Code and the other codes for having dependence with the change post code merge and compiling is compiled described in as a result, judging Whether compiling result has conflict, if there is conflict, conflict notification is sent to the workspace where the change post code.

In one embodiment of the application, the change conflict note at the change conflict center is determined in the monitoring device 1 After record, it is described merge compilation device 2 according to the change conflict record at change conflict center by the change post code and with institute Other codes that stating change post code has dependence merge and compiling is compiled as a result, as shown in figure 3, taking out Being modified code (function A) and and function A described in the workspace of originator P and developer M has other code (letters of dependence Number B) after, the change post code (function A) and other codes (function B) for having dependence with the change post code are led to Finger daemon is crossed to carry out and simultaneously (submit) and compile (code compilation) in advance to obtain compiling result.

After the compiling result is obtained in the merging compilation device 2, the merging compilation device 2 will also judge described Compiling result whether have conflict, if on the one hand it is described compiling result have conflict if, by the finger daemon to it is described more Workspace where changing post code (function A) sends conflict notification, and can be based on the developer P for treating function A places workspace should Conflict notification have to corresponding function A and and function A the corresponding codes of the function B of dependence carry out corresponding code revision and Adjustment；If on the other hand the change conflict record can be deleted, post code will be changed if the compiling result Lothrus apterus (function A) and the center that conflicts is changed from described with other codes (function B) that the change post code (function A) has dependence It deletes, to realize the update at the change conflict center.

Whether then above-described embodiment of the application is changed by the code for monitoring Local work space, and can not only use up can The problem of change conflict of the potential code of discovery that can be early, and conflict notification prompting is carried out to associated developer in time, also Developer's modification change post code can be effectively saved and there are other generations of dependence with the change post code The time of code, the code that reduce has other codes of dependence to the change post code and with the change post code change Workload is write, and then improves co-development efficiency；In addition, the code of Local work space is also monitored by the finger daemon Whether change, whether code that is more convenient, efficiently monitoring Local work space in time is changed.

Then above-described embodiment, the merging compilation device 2 are specifically used for：According to the submission residing for the change post code Stage sends the conflict notification of different stage to the workspace where the change post code.It is carried out below with specific embodiment Explanation：

If the change post code (function A) works in this locality area by modification and submission, can be to the sheet where function A Ground workspace sends the conflict notification of low level, to remind the developer P of the Local work space where function A, allows developer's P energy Know that the function A oneself changed is likely to affect and function A and has the function B, such developer P of dependence in time The responsible developer M of workspace where and function B it can carry out co-development in time and reach an agreement, realization works in this locality Area avoids function A and function B from generating conflict when merging compiling the co-development of function A and function B；

If change post code (function A) area that works in this locality change and if local branch is submitted, understand to Workspace where function A sends high level conflict notification, to remind the developer P of the Local work space where function A, allows Developer P knows that the function A oneself changed influences whether that and function A has the function B of dependence, even function B's It rewriteeing, such developer P promptly the responsible developer M of workspace where and function B can carry out co-development and reach an agreement, By the change post code (function A) before remote warehouse is committed to, which is fallen, to embody the emergency of conflict, In order to avoid cause more cumbersome code rewriting.

Then above-described embodiment judges to obtain in the monitoring device 1 the compiling result when having conflict, to it is described more When workspace where changing post code sends conflict notification, the merging compilation device 2 is additionally operable to：To with the change post code There is the workspace where other codes of dependence, send conflict notification.It is illustrated below with specific embodiment：

In one embodiment of the application, if the change post code (function A) works in this locality, area is changed and in local If workspace is submitted, conflict notification can be sent to the Local work space where function A, to the local work where function A While conflict notification is sent out in area, also punching can be sent as the workspace where other codes (function B) of dependence to and function A Prominent notice, with treat the developer M of the workspace of function B be based on the conflict notification carry out confirming as early as possible with developer P function A by Modification, and mutually reach that co-development is consistent, in case influencing the and function A that developer M is being developed has dependence Other codes (function B) are done over again, can not only be effectively saved developer P and developer M modification it is described change post code and With it is described change post code have dependence other codes time, also reduce to it is described change post code and with it is described more The code that changing post code has other codes of dependence rewrites workload, and then improves co-development efficiency.In addition, pass through Finger daemon monitoring Local work space code whether change, can it is more convenient, efficiently monitor Local work space in time Whether code is changed.

In one embodiment of the application, the merging compilation device 2 is specifically used for：Carrying according to residing for the change post code In the friendship stage, the workspace where having other codes of dependence with the change post code, which is sent, to be led to conflicting for different stage Know.It is illustrated below with specific embodiment：

In one embodiment of the application, if the change post code (function A) has other codes (function B) of dependence Work in this locality area changed and work in this locality area submit if, can to where function B Local work space send low level Conflict notification, to remind the developer M of the Local work space where function B, allow developer M that can know that oneself is being repaiied in time The function B changed is likely to affect has the function A, such developer M of dependence can and function A institutes in time with rising Responsible developer P in workspace carries out co-development and reaches an agreement, and realizes association of the area to function A and function B that work in this locality With exploitation, function A and function B is avoided to generate conflict when merging compiling；

The Qu Beixiu if other codes (function B) for having dependence with the change post code (function A) work in this locality Change and if being submitted in local branch, high level conflict notification can be sent to the Local work space where function B, to carry The developer M of Local work space where awake function B, allows developer M to know that the function B oneself changed is influenced whether to it Have the function A of dependence or even cause the rewriting of function A, such developer M can before function B is committed to remote warehouse, The developer P of workspace where and function A carries out coordinated development and reaches an agreement, and such developer M can be based on the high level punching The modification of prominent notice and function A carry out function B the modification of corresponding code adjustment or developer M based on function A and correspond to The code of function B is written over, caused after being committed to remote warehouse to avoid the corresponding codes of function B are standby in co-development One party larger energy is spent to repair code or rewriting portion code.

In one embodiment of the application, the merging compilation device 2 is additionally operable to：Workspace where the change post code Receive the feedback of the Conflict solving based on the conflict notification；Corresponding change conflict is deleted according to the feedback of the Conflict solving Record.

In one embodiment of the application, the developer P of the workspace where function A receive based on the conflict notification it Afterwards, corresponding solution is made that conflict, and Conflict solving is sent to the finger daemon of remote warehouse based on the solution of conflict Feedback is deleted the corresponding change conflict records of function A from change conflict center based on the feedback of the Conflict solving, to update Change conflict center is stated, the conflict solved is avoided to repeat unnecessary conflict and judges and repeats to make corresponding conflict Notice.

In one embodiment of the application, the merging compilation device 2 is additionally operable to：The change conflict is checked every preset time Record whether there is, if in the presence of, to it is described change post code where workspace send conflict notification again.

In one embodiment of the application, by the finger daemon to the work where the change post code (function A) After area sends conflict notification, in order to continue whether the workspace where monitoring function A is carried out based on the conflict notification received Corresponding modification checks whether the corresponding change conflict record of the conflict notification also has change punching every preset time △ T Prominent center, if in the presence of, then it represents that the corresponding conflict notification sent of change conflict record is not adopted in the workspace where function A Corresponding measure is taken to modify adjustment, needs to send again to the workspace where the change post code (function A) at this time Conflict notification, to treat the developer P of the workspace where function A based on the conflict notification sent again to corresponding function A It carries out corresponding modification the present embodiment and whether there is by constantly monitoring change conflict record in preset interval time section, as long as In the presence of just illustrating that conflict is handled not yet between corresponding code, can send conflict notification again, until corresponding code in time Between clash handle complete, change conflict record deletion, so as to avoid between the corresponding code for the conflict notification having been sent from Conflict does not solve the problems, such as in time, ensures to conflict between each code to be effectively addressed.

In one embodiment of the application, the merging compilation device 2 is used for：According to the submission rank residing for the change post code Section sends the conflict notification of different stage to the workspace where the change post code again.Below with specific embodiment into Row explanation：

In one embodiment of the application, merge compilation device 2 and be additionally operable to：To with it is described change post code have dependence its Workspace where its code, sends conflict notification again.It is illustrated below with specific embodiment：

In one embodiment of the application, after judging that obtaining the compiling result has conflict, and the change post code Workspace where (function A) there is no corresponding code revision is made based on the conflict notification, then can to after the change While workspace where code (function A) sends conflict notification again, there is dependence to the change post code (function A) Workspace where other codes (function B) of relation sends conflict notification again, to wait to remind the workspace where function B Developer M carry out confirming that function A has been changed with developer P as early as possible based on the conflict notification, while mutually reached with developer P It is consistent into co-development, in case influencing the and function A that developer M is being developed has other code (functions of dependence Doing over again B), can be effectively saved the developer P and developer M modifications change post code and have with the change post code The time of other codes of dependence, reduce has dependence to the change post code and with the change post code The code of other codes rewrites workload, and then improves co-development efficiency.It is appreciated that the application also passes through finger daemon Monitoring Local work space code whether change, more convenient, efficiently can monitor in time Local work space code whether Change.

In one embodiment of the application, merge compilation device 2 and be specifically used for：According to the submission rank residing for the change post code Section, the workspace where having other codes of dependence with the change post code, sends the conflict of different stage again Notice.It is illustrated below with specific embodiment：

In conclusion the application is by monitoring whether the code of Local work space is changed, when monitoring the local work During the coding change in area, generate it is corresponding change conflict record, it is described conflict record include change post code and with the change Post code has other codes of dependence；Then, there is dependence by the change post code and with the change post code Other codes merge and compiling compiled as a result, then judge it is described compiling result whether have conflict, if there is conflict, Conflict notification then is sent to the workspace where the change post code, while has dependence to the change post code Workspace where other codes, sends conflict notification so that it is described change post code where workspace and with the change Post code have workspace where other codes of dependence to the change post code that clashes and other described codes into Row correspondingly change and adjust, can not only be effectively saved developer modification it is described change post code and with after the change Code has the time of other codes of dependence, also reduce to it is described change post code and with it is described change post code have according to The code of the other codes for the relation of relying rewrites workload, and then improves co-development efficiency.The application also passes through finger daemon Monitoring Local work space code whether change, more convenient, efficiently can monitor in time Local work space code whether Change.

In the practical application scene of the code conflicts detection method provided in the application, when each exploitation branch of needs One travel application program of developer's co-development, developer P is responsible for the login function code of the travel application program, developer M is responsible for the function of browse code of the travel application program, and developer N is responsible for the payment function code of the travel application program, In,

Function of browse code call login function code, payment function code call login function code and function of browse generation Code when finger daemon monitors that developer M modifies to function of browse code, receives the workspace hair where developer M The request feedback information brought, and have logging in for dependence by the function of browse code of modification and with function of browse code Function code and payment function code are recorded in code conflicts center, generation code conflicts record, by the function of browse of the modification Code and there are the login function code of dependence and payment function code to merge and compile with function of browse code To compiling as a result, and judge whether the compiling result has conflict,

If there is conflict, simultaneously to function of browse code and remaining function of browse have dependence login function code and Workspace where payment function code sends conflict notification respectively, and conflict is based on person P to be developed, developer M and developer N Notice takes corresponding modification measure to corresponding login function code, function of browse code and payment function code, not only keeps away Exempt to cause a side that larger energy is spent to repair corresponding code or rewriting portion code after code is submitted to remote warehouse, Also improve co-development efficiency.It is appreciated that whether more the application also monitors the code of Local work space by finger daemon Change, can more convenient, efficiently monitor whether the code of Local work space is changed in time.

According to a kind of equipment based on calculating of the application, including：

Processor；And

Obviously, those skilled in the art can carry out the application essence of the various modification and variations without departing from the application God and scope.In this way, if these modifications and variations of the application belong to the scope of the application claim and its equivalent technologies Within, then the application is also intended to comprising including these modification and variations.

It should be noted that the application can be carried out in the assembly of software and/or software and hardware, for example, can adopt With application-specific integrated circuit (ASIC), general purpose computer or any other realized similar to hardware device.In one embodiment In, the software program of the application can perform to realize steps described above or function by processor.Similarly, the application Software program can be stored in computer readable recording medium storing program for performing (including relevant data structure), for example, RAM memory, Magnetic or optical driver or floppy disc and similar devices.In addition, hardware can be used to realize in some steps or function of the application, example Such as, as the circuit for coordinating to perform each step or function with processor.

In addition, the part of the application can be applied to computer program product, such as computer program instructions, when its quilt When computer performs, by the operation of the computer, it can call or provide according to the present processes and/or technical solution. And the program instruction of the present processes is called, be possibly stored in fixed or moveable recording medium and/or is passed through Broadcast or the data flow in other signal bearing medias and be transmitted and/or be stored according to described program instruction operation In the working storage of computer equipment.Here, including a device according to one embodiment of the application, which includes using Memory in storage computer program instructions and processor for executing program instructions, wherein, when the computer program refers to When order is performed by the processor, method and/or skill of the device operation based on foregoing multiple embodiments according to the application are triggered Art scheme.

It is obvious to a person skilled in the art that the application is not limited to the details of above-mentioned exemplary embodiment, Er Qie In the case of without departing substantially from spirit herein or essential characteristic, the application can be realized in other specific forms.Therefore, no matter From the point of view of which point, the present embodiments are to be considered as illustrative and not restrictive, and scope of the present application is by appended power Profit requirement rather than above description limit, it is intended that all by what is fallen within the meaning and scope of the equivalent requirements of the claims Variation is included in the application.Any reference numeral in claim should not be considered as to the involved claim of limitation.This Outside, it is clear that one word of " comprising " is not excluded for other units or step, and odd number is not excluded for plural number.That is stated in device claim is multiple Unit or device can also be realized by a unit or device by software or hardware.The first, the second grade words are used for table Show title, and do not represent any particular order.

Claims

1. a kind of code conflicts detection method, wherein, applied to the server where remote warehouse, the described method includes：

Whether the code of monitoring Local work space is changed, and when monitoring the coding change of the Local work space, generation corresponds to Change conflict record, the conflict record includes changing post code and changes post code with described and have other generations of dependence Code；

By the change post code and the other codes for having dependence with the change post code merge and compiling obtains Compiling as a result, judge it is described compiling result whether have conflict, if there is conflict, to it is described change post code where workspace send Conflict notification.

2. whether the code for the method for claim 1, wherein monitoring Local work space is changed, including：

3. the method for claim 1, wherein sending conflict notification to the workspace where the change post code, wrap It includes：

According to the presentation stage residing for the change post code, different stage is sent to the workspace where the change post code Conflict notification.

4. the method for claim 1, wherein the same of conflict notification is sent to the workspace where the change post code When, it further includes：

5. method as claimed in claim 4, wherein, where having other codes of dependence with the change post code Workspace sends conflict notification, including：

According to the presentation stage residing for the change post code, to the other code institutes for having dependence with the change post code Workspace send the conflict notification of different stage.

6. the method for claim 1, wherein judge it is described compiling result whether have conflict after, further include：

If Lothrus apterus, the change conflict record is deleted.

7. the method for claim 1, wherein to it is described change post code where workspace send conflict notification it Afterwards, further include：

8. the method for claim 7, wherein, to it is described change post code where workspace send conflict notification it Afterwards, further include：

Check that the change conflict record whether there is every preset time,

9. method as claimed in claim 8, wherein, it is logical that conflict is sent again to the workspace where the change post code Know, including：

According to the presentation stage residing for the change post code, difference is sent again to the workspace where the change post code The conflict notification of rank.

10. method as claimed in claim 8, wherein, it is logical to send conflict to the workspace occurrence where the change post code While knowing, further include：

11. method as claimed in claim 10, wherein, to the other codes place for having dependence with the change post code Workspace, send conflict notification again, including：

According to the presentation stage residing for the change post code, to the other code institutes for having dependence with the change post code Workspace, send the conflict notification of different stage again.

12. a kind of code conflicts detection device, wherein, applied to the server where remote warehouse, the equipment includes：

Monitoring device, for monitoring whether the code of Local work space is changed, when monitoring the code of the Local work space more When changing, generate it is corresponding change conflict record, it is described conflict record include change post code and with it is described change post code have according to The other codes for the relation of relying；

Merge compilation device, for by the change post code and with the change post code have other codes of dependence into Row merges and compiling is compiled as a result, judging whether the compiling result has conflict, if there is conflict, to the change post code The workspace at place sends conflict notification.

13. equipment as claimed in claim 12, wherein, the monitoring device is used for：

14. equipment as claimed in claim 12, wherein, the merging compilation device is used for：

15. equipment as claimed in claim 12, wherein, the merging compilation device is additionally operable to：

16. equipment as claimed in claim 15, wherein, the merging compilation device is used for：

17. equipment as claimed in claim 12, wherein, the merging compilation device is additionally operable to：

If Lothrus apterus, the change conflict record is deleted.

18. equipment as claimed in claim 12, wherein, the merging compilation device is additionally operable to：

19. equipment as claimed in claim 18, wherein, the merging compilation device is additionally operable to：

Check that the change conflict record whether there is every preset time,

20. equipment as claimed in claim 19, wherein, the merging compilation device is used for：

21. equipment as claimed in claim 19, wherein, the merging compilation device is additionally operable to：

22. equipment as claimed in claim 21, wherein, the merging compilation device is used for：

23. a kind of equipment based on calculating, including：

Processor；And

The memory of storage computer executable instructions is arranged to, the executable instruction makes the processing when executed Device：