CN106126410A

CN106126410A - The reminding method of code conflicts and device

Info

Publication number: CN106126410A
Application number: CN201610363877.6A
Authority: CN
Inventors: 张宪; 马迪欣
Original assignee: Huawei Technologies Co Ltd
Current assignee: Huawei Technologies Co Ltd
Priority date: 2016-05-26
Filing date: 2016-05-26
Publication date: 2016-11-16
Anticipated expiration: 2036-05-26
Also published as: CN106126410B

Abstract

The invention discloses reminding method and the device of a kind of code conflicts, belong to areas of information technology.Described method includes: during N number of terminal is used for writing application code, server receives the code information of N number of terminal, in N number of terminal, the code information of i-th terminal is used for the code indicating i-th terminal position in application code, the instruction of the code information according to i-th terminal, judge whether the code of i-th terminal meets conflict condition, when the code of i-th terminal meets conflict condition, generate conflicting information, send conflicting information to i-th terminal.Wherein, N is positive integer, and i is any one integer in interval [1, N].The present invention shows conflicting information to developer in time by terminal, developer can determine the situation of existing code conflicts easily and efficiently, and in time situation for code conflicts adjusts, revises, and decreases amendment, proofreads the time that code is spent, improves efficiency.

Description

The reminding method of code conflicts and device

Technical field

The present invention relates to areas of information technology, particularly to reminding method and the device of a kind of code conflicts.

Background technology

Along with the function of application program is continuously increased, accordingly, the scale of application program is also being continuously increased, should in exploitation When using program, it is also desirable to increasing developer writes code, the exploitation of the application program that cooperated.

And when developer writes code, multiple developers to modifying with a code, or would generally open The code with dependence can be modified by the personnel of sending out, and finally results in and code conflicts occurs.In order to avoid occurring that code rushes Prominent, generally after developer writes completion code and submits code to, by repository or CI (Continuous Integration, continuous integrating) code submitted to detects and operates with test etc. by instrument, finally provides test result, to Developer shows the position of existing code conflicts, in order to developer is analyzed according to test result, and solves code punching The problem such as prominent.

During realizing the present invention, inventor finds that prior art at least there is problems in that

After developer writes completion code and submits code to, code could be surveyed by repository or CI instrument Examination, whether developer can not be pointed out in time to occur, and code, then need out if there is problems such as code conflicts if conflict occur The personnel of sending out modify and proofread code, cause cost overlong time, the problems such as efficiency is too low.

Summary of the invention

In order to solve to write in coding process, revise and proofread code after code conflicts occurs and spend time length, efficiency low Problem, embodiments provide a kind of catalog management method, Apparatus and system.Described technical scheme is as follows:

First aspect, embodiments provides the reminding method of a kind of code conflicts, and described method includes:

During N number of terminal is used for writing application code, server receives the code letter of described N number of terminal Breath, in described N number of terminal, the code information of i-th terminal is for indicating the code of described i-th terminal at described application program Position in code, N is positive integer, and i is any one integer in interval [1, N]；

Described server is according to the instruction of the code information of described i-th terminal, it is judged that the code of described i-th terminal is No meet conflict condition；

When the code of described i-th terminal meets described conflict condition, described server generates conflicting information；

Described server sends described conflicting information to described i-th terminal.

In a kind of possible design, the code information of described i-th terminal includes that the code of described i-th terminal is corresponding Repository address, branch and file directory information；

Described server is according to the instruction of the code information of described i-th terminal, it is judged that the code of described i-th terminal is No meet conflict condition, including:

Described server is believed according to the repository address in the code information of described i-th terminal, branch and file directory Breath, it is judged that repository address, branch and the file directory information of described i-th terminal, if with m in described N number of terminal The repository address of individual terminal, branch are identical with file directory information, and m is any one integer in interval [1, N], and and i Different；

If repository address, branch and the file directory information of described i-th terminal and m in described N number of terminal The repository address of individual terminal, branch are identical with file directory information, then meet described conflict condition.

In a kind of possible design, the code information of described i-th terminal also includes differential file；

Described when the code of described i-th terminal meets described conflict condition, described server generates conflicting information, bag Include:

When the code of described i-th terminal meets described conflict condition, described server is according to described i-th terminal Differential file, determines the code revision position of described i-th terminal；

Described server determines the conflict type of described i-th terminal according to described code revision position；

Described server generates the conflicting information of described i-th terminal according to described conflict type.

In a kind of possible design, determine described i-th terminal at described server according to described code revision position Conflict type after, described method also includes:

When described conflict type include can merging type automatically time, described server determines that levels of conflict is first level；

When described conflict type include can not merging type and when not submitting type of code to automatically, described server determines institute Stating levels of conflict is second level；

When described conflict type include can not merging type and when having been filed on type of code automatically, described server determines institute Stating levels of conflict is third level；

Described server generates the conflicting information of described i-th terminal according to described conflict type, including:

Described server generates the conflicting information of described i-th terminal according to described conflict type and described levels of conflict.

In a kind of possible design, the conflicting information of described i-th terminal includes the conflict class of described i-th terminal Type, described i-th terminal the levels of conflict developer information corresponding with described i-th terminal at least one.

Described server is believed according to the repository address in the code information of described i-th terminal, branch and file directory Breath, it is judged that repository address, branch and the file directory information of i-th terminal, if with address, preset configuration storehouse, preset point Prop up identical with default file directory information；

If repository address, branch and the file directory information of described i-th terminal and ground, described preset configuration storehouse Location, described default branch are identical with described default file directory information, then meet described conflict condition.

Second aspect, embodiments provides the reminding method of a kind of code conflicts, and described method includes:

Terminal, during being used for writing application code, obtains code information, and described code information is used for indicating The code of terminal position in described application code；

Described terminal to server sends described code information；

Described terminal receives the conflicting information that the code of described terminal that described server sends is corresponding；

The conflicting information that the code of terminal described in described terminal demonstration is corresponding.

In a kind of possible design, described conflicting information includes the conflict type of described terminal, the conflict of described terminal At least one in developer's information that rank is corresponding with described terminal；

The conflicting information that the code of terminal described in described terminal demonstration is corresponding, including:

Described terminal determines the color of preset pattern according to the levels of conflict of described terminal；

Described terminal shows described preset pattern and described developer's information at predeterminated position.

In a kind of possible design, when described terminal detects user's trigger action to showing detailed conflicting information After, show that detailed conflicting information, described detailed conflicting information include position and the contention-resolution schemes of conflict code.

The third aspect, embodiments provides the suggestion device of a kind of code conflicts, and described device includes:

Receiver module, for during N number of terminal is used for writing application code, receives described N number of terminal Code information, in described N number of terminal, the code information of i-th terminal is for indicating the code of described i-th terminal to answer described With the position in program code, N is positive integer, and i is any one integer in interval [1, N]；

Judge module, for the instruction of the code information according to described i-th terminal, it is judged that the generation of described i-th terminal Whether code meets conflict condition；

Generation module, for when the code of described i-th terminal meets described conflict condition, generates conflicting information；

Sending module, for sending described conflicting information to described i-th terminal.

Described judge module is additionally operable to repository address, branch and literary composition in the code information according to described i-th terminal Part directory information, it is judged that repository address, branch and the file directory information of described i-th terminal, if with described N number of end The repository address of m-th terminal in end, branch are identical with file directory information, and m is that any one in interval [1, N] is whole Number, and different from i, if repository address, branch and the file directory information of described i-th terminal and described N number of terminal The repository address of middle m-th terminal, branch are identical with file directory information, then meet described conflict condition.

Described generation module is additionally operable to when the code of described i-th terminal meets described conflict condition, according to described i-th The differential file of individual terminal, determines the code revision position of described i-th terminal, determines described according to described code revision position The conflict type of i-th terminal, generates the conflicting information of described i-th terminal according to described conflict type.

In a kind of possible design, described device also includes:

Determine module, for when described conflict type include can merging type automatically time, determine that levels of conflict is the first order Not；

Described determine that module is additionally operable to when described conflict type that include can not merging type and do not submit type of code to automatically Time, determine that described levels of conflict is second level；

Described determine that module is additionally operable to when described conflict type that include can not merging type and have been filed on type of code automatically Time, determine that described levels of conflict is third level；

Described generation module is additionally operable to generate rushing of described i-th terminal according to described conflict type and described levels of conflict Prominent information.

Described judge module is additionally operable to repository address, branch and literary composition in the code information according to described i-th terminal Part directory information, it is judged that repository address, branch and the file directory information of i-th terminal, if with ground, preset configuration storehouse Location, preset branch identical with default file directory information, if repository address, branch and the file of described i-th terminal Directory information is identical with address, described preset configuration storehouse, described default branch and described default file directory information, then meet institute State conflict condition.

Fourth aspect, embodiments provides the suggestion device of a kind of code conflicts, and described device includes:

Acquisition module, for during writing application code, obtains code information, and described code information is used for The code of instruction terminal position in described application code；

Sending module, for sending described code information to server；

Receiver module, for receiving the conflicting information that the code of the described terminal that described server sends is corresponding；

First display module, for showing the conflicting information that the code of described terminal is corresponding.

Described first display module is additionally operable to the levels of conflict according to described terminal and determines the color of preset pattern, is presetting Preset pattern described in position display and described developer's information.

In a kind of possible design, described device also includes:

Second display module, for after user's trigger action to the detailed conflicting information of display being detected, display is in detail Conflicting information, described detailed conflicting information includes position and the contention-resolution schemes of conflict code.

The technical scheme that the embodiment of the present invention provides has the benefit that

The reminding method of the code conflicts provided in the embodiment of the present invention and device, writing application program generation by terminal During Ma, obtaining code information, and code information sent to server, server receives the code information of N number of terminal, According to the instruction of the code information of i-th terminal in N number of terminal, it is judged that whether the code of i-th terminal meets conflict condition, as Fruit meets conflict condition and then generates conflicting information, and sends to i-th terminal, and i-th terminal receives and shows this conflicting information. Showing this conflicting information to developer in time by terminal, developer can determine existing code conflicts easily and efficiently Situation, and in time situation for code conflicts adjusts, revises, and decreases amendment, proofreads the time that code is spent, Improve efficiency.

Accompanying drawing explanation

For the technical scheme being illustrated more clearly that in the embodiment of the present invention, in embodiment being described below required for make Accompanying drawing be briefly described, it should be apparent that, below describe in accompanying drawing be only some embodiments of the present invention, for From the point of view of those of ordinary skill in the art, on the premise of not paying creative work, it is also possible to obtain other according to these accompanying drawings Accompanying drawing.

Fig. 1 is the structural representation of the prompt system of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 2 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 3 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 4 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 5 is the structural representation of the suggestion device of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 6 is the structural representation of the suggestion device of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 7 is the structural representation of the suggestion device of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 8 is the structural representation of the suggestion device of a kind of code conflicts that the embodiment of the present invention provides；

Fig. 9 is the structural representation of a kind of server that the embodiment of the present invention provides；

Figure 10 is the structural representation of a kind of terminal that the embodiment of the present invention provides.

Detailed description of the invention

For making the object, technical solutions and advantages of the present invention clearer, below in conjunction with accompanying drawing to embodiment party of the present invention Formula is described in further detail.

Fig. 1 is the structural representation of the prompt system of a kind of code conflicts that the embodiment of the present invention provides, and sees Fig. 1, should The prompt system of code conflicts includes: server and multiple terminal, between each terminal and this server respectively by network even Connect.

For each terminal, this terminal first obtains code information, and sends this code information to server, and server connects Receive the code information that each terminal sends, and judge the code of i-th terminal in N number of terminal according to the code information of each terminal Whether meeting conflict condition, if meeting conflict condition, then sending conflicting information to i-th terminal.Wherein, N is positive integer, i For any one integer in interval [1, N].

Fig. 2 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides, as in figure 2 it is shown, this generation In the server of the prompt system that the reminding method of code conflict is applied to the code conflicts shown in Fig. 1, comprise the following steps:

In step 201, during N number of terminal is used for writing application code, server receives this N number of terminal Code information.

Wherein, N is positive integer, and i is any one integer in interval [1, N], the code of i-th terminal in N number of terminal Information is used for the code indicating i-th terminal position in this application code.

In step 202., server is according to the instruction of the code information of i-th terminal, it is judged that the code of i-th terminal is No meet conflict condition.

In step 203, when the code of i-th terminal meets conflict condition, server generates conflicting information.

In step 204, server sends conflicting information to i-th terminal.

In sum, the reminding method of the code conflicts provided in the embodiment of the present invention, by writing application program generation During Ma, and sending code information to server, server receives the code information that N number of terminal obtains, according to N number of end The instruction of the code information of i-th terminal in end, it is judged that whether the code of i-th terminal meets conflict condition, if meeting punching Ridge part then generates conflicting information, and sends to i-th terminal, and i-th terminal receives and shows this conflicting information.Pass through terminal Showing this conflicting information to developer in time, developer can determine the situation of existing code conflicts easily and efficiently, and Situation for code conflicts adjusts, revises in time, decreases amendment, proofreads the time that code is spent, improves effect Rate.

Alternatively, the code information of this i-th terminal include repository address that the code of this i-th terminal is corresponding, point Prop up and file directory information；

Server is according to the instruction of the code information of i-th terminal, it is judged that whether the code of i-th terminal meets conflict bar Part, including:

Server is according to repository address, branch and the file directory information in the code information of i-th terminal, it is judged that the Repository address, branch and the file directory information of i terminal, if with the repository ground of m-th terminal in N number of terminal Location, branch are identical with file directory information, and m is any one integer in interval [1, N], and different from i；

If repository address, branch and the file directory information of i-th terminal and m-th terminal in N number of terminal Repository address, branch are identical with file directory information, then meet conflict condition.

Alternatively, the code information of i-th terminal also includes differential file；

When the code of this i-th terminal meets this conflict condition, this server generates conflicting information, including:

When the code of this i-th terminal meets this conflict condition, this server is according to the difference literary composition of this i-th terminal Part, determines the code revision position of this i-th terminal；

This server determines the conflict type of this i-th terminal according to this code revision position；

This server generates the conflicting information of this i-th terminal according to this conflict type.

Alternatively, after this server determines the conflict type of this i-th terminal according to this code revision position, the party Method also includes:

When this conflict type include can merging type automatically time, this server determines that levels of conflict is first level；

When this conflict type include can not merging type and when not submitting type of code to automatically, this server determines this conflict Rank is second level；

When this conflict type include can not merging type and when having been filed on type of code automatically, this server determines this conflict Rank is third level；

This server generates the conflicting information of this i-th terminal according to this conflict type, including:

This server generates the conflicting information of this i-th terminal according to this conflict type and this levels of conflict.

Alternatively, the conflicting information of this i-th terminal includes the conflict type of this i-th terminal, the rushing of this i-th terminal At least one in developer's information that prominent rank is corresponding with this i-th terminal.

This server is according to the instruction of the code information of this i-th terminal, it is judged that whether the code of this i-th terminal meets Conflict condition, including:

This server, according to repository address, branch and file directory information in the code information of this i-th terminal, is sentenced Repository address, branch and the file directory information of disconnected i-th terminal, if with address, preset configuration storehouse, preset branch and Default file directory information is identical；

If repository address, branch and the file directory information of this i-th terminal and this address, preset configuration storehouse, should Preset branch identical with this default file directory information, then meet this conflict condition.

Fig. 3 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides, as it is shown on figure 3, this generation In the terminal of the prompt system that the reminding method of code conflict is applied to the code conflicts shown in Fig. 1, comprise the following steps:

In step 301, terminal, during being used for writing application code, obtains code information.

Wherein, this code information is used for the code indicating terminal position in this application code.

In step 302, terminal to server sends code information.

In step 303, the conflicting information that the code of this terminal that terminal receives server transmission is corresponding.

In step 304, the conflicting information that the code of this terminal of terminal demonstration is corresponding.

In sum, the reminding method of the code conflicts provided in the embodiment of the present invention, writing application journey by terminal During sequence code, obtain code information, and code information is sent to server, in order to server is according to the N received The instruction of the code information of i-th terminal in individual terminal, it is judged that whether the code of i-th terminal meets conflict condition, if full Foot conflict condition then generates conflicting information, and is back to i-th terminal, and i-th terminal receives and shows this conflicting information.Pass through Terminal shows this conflicting information to developer in time, and developer can determine the feelings of existing code conflicts easily and efficiently Condition, and the time that in time situation for code conflicts adjusts, revises, and decreases amendment, check and correction code is spent, raising Efficiency.

Alternatively, this conflicting information include the conflict type of this terminal, this terminal levels of conflict corresponding with this terminal At least one in developer's information；

The conflicting information that the code of this terminal of terminal demonstration is corresponding, including:

Terminal determines the color of preset pattern according to the levels of conflict of this terminal；

Terminal shows this preset pattern and this developer's information at predeterminated position.

Alternatively, the method also includes:

After terminal detects user's trigger action to the detailed conflicting information of display, showing detailed conflicting information, this is detailed Thin conflicting information includes position and the contention-resolution schemes of conflict code.

Fig. 4 is the flow chart of the reminding method of a kind of code conflicts that the embodiment of the present invention provides, as shown in Figure 4, this generation The interaction agent of the reminding method of code conflict is server and terminal, comprises the following steps:

In step 401, during developer utilizes terminal to write application code, terminal obtains code letter Breath, and send this code information to server.

Wherein, this terminal, for writing the code of application program, can include computer, panel computer etc., and the present invention implements This is not limited by example.

During developer utilizes terminal to write application code, terminal obtains this terminal every preset duration Code information, and by this code information send to server, in order to server can determine this terminal according to this code information Code whether with the situation of the code generation code conflicts of other-end.

Wherein, this preset duration can determine according to the speed writing code, and this is not limited by the embodiment of the present invention.

It addition, the code building that this code information can be write according to this terminal, for indicating this terminal to be write Code position in application code, and this code information can include the repository ground that the code of this terminal is corresponding Location, branch, file directory information and differential file.

Wherein, this differential file can be to include amendment mode, amendment line number, location revision and modification time.This amendment side Formula can include increasing and deleting, and this amendment line number can represent the total number of line number occupied by the code being modified, this amendment Position i.e. can represent the code of amendment accurate location in the application, when modification time i.e. can represent amendment code Time point.

For example, it is possible to by the IDE in terminal, (Integrated Development Environment integrated opens Hair ring border) code of application program modifies, IDE can obtain code information every preset duration, and by rest, The transmission standards such as webservice, send the code information got to server.Or, can insert by adding for IDE The mode of part makes IDE have the function of above-mentioned acquisition code information.

It should be noted that in actual applications, generally using repository address, branch as repository information, by file Repository information and the code modification information of acquisition are sent out by directory information and differential file as code modification information, terminal simultaneously Deliver to server.

And, it is the most only as a example by a terminal, illustrate that terminal obtains code information and sends to service The process of device, and the embodiment of the present invention needs multiple terminal obtain code information, each terminal obtains code information and sends Similar with the process in step 401 to the process of server, do not repeat them here.

In step 402, server receives the code information of N number of terminal, according to the finger of the code information of i-th terminal Show, it is judged that whether the code of i-th terminal meets conflict condition.

Wherein, N is positive integer, and i is any one integer in interval [1, N].

Corresponding with step 401, in N number of terminal, the code information of i-th terminal is i.e. for indicating the generation of i-th terminal Code position in application code, the code information of i-th terminal includes the repository ground that the code of i-th terminal is corresponding Location, branch and file directory information.

It addition, this conflict condition is for judging whether the code of i-th terminal occurs in that the situation of code conflicts, this conflict Condition can be the code revision position that code revision position corresponding to i-th terminal is corresponding with other any terminal in N number of terminal Put identical, or the code revision position that i-th terminal is in the application is identical with pre-set code location revision.

Wherein, this pre-set code location revision is the position relying on code, if this dependence code is modified possibility Other disablers in application program can be caused.

Server receives in N number of terminal after the code information of each terminal, judges the according to the code information of i-th terminal Whether the code of i terminal meets conflict condition, judges the generation of i+1 terminal further according to the code information of i+1 terminal Whether code meets conflict condition, until the code information to terminal each in N number of terminal is judged.

Wherein, all including repository address, branch and file directory information in the code information of each terminal, server can With repository address, branch and file directory information according to i-th terminal, determine the code revision position that i-th terminal is corresponding Put, thus judge whether the code of i-th terminal meets conflicting information.

Specifically, server is believed according to the repository address in the code information of i-th terminal, branch and file directory Breath, it is judged that repository address, branch and the file directory information of i-th terminal, if with m-th terminal in N number of terminal Repository address, branch are identical with file directory information, if repository address, branch and the file directory of i-th terminal Information is identical with repository address, branch and the file directory information of m-th terminal in N number of terminal, then meet conflict condition.

That is to say server repository address, branch and file directory information according to i-th terminal, determine i-th The code revision position that terminal is corresponding, and according to repository address, branch and the file directory information of m-th terminal, determine m The code revision position that individual terminal is corresponding, it is judged that the code that code revision position corresponding to i-th terminal is corresponding with m-th terminal Location revision is the most identical, if identical, then meets conflict condition, and code and m-th terminal that i-th terminal revised are described The code revised is co-located, can cause the situation of code conflicts.

Wherein, m is any one integer in interval [1, N], and different from i.

For example, it is possible to set up real-time collaborative dispatching patcher on the server by the first web services program, receive N number of end The code information that end sends, and the code information received is stored in the cooperative information data that real-time collaborative dispatching patcher is corresponding In storehouse.And, set up conflict matching system on the server by the second web services program, this conflict matching system is every in advance If duration obtains the code information of N number of terminal from this cooperative information data base, and judges the generation of i-th terminal in N number of terminal Whether code meets conflict condition.

Wherein, this conflict matching system can be set up on the same server with this real-time collaborative dispatching patcher, it is possible to To set up on a different server, this is not limited by the embodiment of the present invention.It addition, this conflict matching system can also is that this One functional module of real-time collaborative dispatching patcher, this is not limited by the embodiment of the present invention.

It should be noted that this conflict condition can also be i-th terminal corresponding code revision position and predeterminated position Identical, accordingly, server judges that code revision position corresponding to i-th terminal is the most identical with predeterminated position.

Specifically, server is believed according to the repository address in the code information of i-th terminal, branch and file directory Breath, it is judged that repository address, branch and the file directory information of i-th terminal, if with address, preset configuration storehouse, preset point Prop up identical with default file directory information, if repository address, branch and the file directory information of i-th terminal are with default Repository address, preset branch identical with default file directory information, then meet conflict condition.

That is to say server repository address, branch and file directory information according to i-th terminal, determine i-th The code revision position that terminal is corresponding, and according to address, preset configuration storehouse, default branch and default file directory information, determine pre- If code revision position, it is judged that code revision position corresponding to i-th terminal is the most identical with pre-set code location revision, if Identical, then meet conflict condition, illustrate that the code that i-th terminal is revised is the dependence code of other codes in application program, The situation of code conflicts can be caused.

In step 403, when the code of i-th terminal meets conflict condition, server generates conflicting information, to i-th Individual terminal sends this conflicting information.

Server is when the code determining i-th terminal meets conflict condition, for the developer that i-th terminal is corresponding Can know that the code of this i-th terminal occurs in that the situation of code conflicts in time, need to determine i-th terminal at server After code meets conflict condition, quickly generate conflicting information, and send this conflicting information to i-th terminal, in order to prompting exploitation Personnel occur in that the situation of code conflicts.

Wherein, the code information of i-th terminal also includes differential file, and this differential file includes amendment mode, amendment row The information such as number, location revision and modification time, server can generate conflicting information according to the differential file of i-th terminal.

Specifically, when the code of i-th terminal meets conflict condition, server according to the differential file of i-th terminal, Determine the code revision position of i-th terminal, determine the conflict type of i-th terminal, server root according to code revision position The conflicting information of i-th terminal is generated according to conflict type.

Wherein, server can determine the generation of i-th terminal according to the location revision in the differential file of i-th terminal The accurate location revision of code, and the accurate location revision of the code of m-th terminal is determined according to the differential file of m-th terminal, If i-th terminal is different from the accurate location revision of the code of m-th terminal, then the code of i-th terminal and m-th terminal Code can automatically merge, determine that the conflict type of i-th terminal is for can merging type automatically；If i-th terminal and m-th The accurate location revision of the code of terminal is identical, then the code of i-th terminal can not merge automatically with the code of m-th terminal, Determine that the conflict type of i-th terminal is for can not merging type automatically.

And, if the conflict type of i-th terminal be can not merging type automatically, judge the generation of m-th terminal the most again Code is the most submitted, if the most submitted, then the conflict type of i-th terminal can also include having been filed on type of code, as Fruit is not also submitted to, then the conflict type of i-th terminal can also include not submitting type of code to.

It addition, server can also determine levels of conflict according to the conflict type of i-th terminal, and according to according to this conflict Type and this levels of conflict generate the conflicting information of this i-th terminal.

Such as, when this conflict type include can merging type automatically time, this server may determine that levels of conflict is first Rank；When this conflict type include can not merging type and when not submitting type of code to automatically, this server may determine that this punching Prominent rank is second level；When this conflict type, include can not merging type and when having been filed on type of code, this server automatically May determine that this levels of conflict is third level.

Accordingly, the conflicting information of i-th terminal can include the conflict type of i-th terminal, the conflict of i-th terminal At least one in developer's information that rank is corresponding with i-th terminal.Wherein, i-th terminal can sent out to server When sending code information, simultaneously by sent along to server for developer's information corresponding for i-th terminal, it would however also be possible to employ other Mode sends to server, and this is not limited by the embodiment of the present invention.

In step 404, terminal receives the conflicting information that the code of this terminal that server sends is corresponding, and shows this end The conflicting information corresponding to code of end.

When the code of terminal meets conflict condition, the situation of code conflicts occurs, terminal can receive server and send Conflicting information, and show this conflicting information to developer.Such as, terminal shows this preset pattern and exploitation at predeterminated position Personal information, naturally it is also possible to adopt and be shown to developer in other ways, this is not limited by the embodiment of the present invention.

Wherein, this predeterminated position, can be according to this conflicting information in the project navigation bar of the development environment of application program With each file in this project navigation bar and the position of catalogue, determine the code clashed position in this project navigation bar Put.

And, terminal can determine the color of preset pattern according to the levels of conflict of this terminal.Such as, when this levels of conflict During for first level, it may be determined that the color of this preset pattern is blue；When this levels of conflict is second level, it may be determined that this is pre- If the color of figure is orange；When this levels of conflict is third level, it may be determined that the color of this preset pattern is red, this This is not limited by bright embodiment.

It addition, when terminal detect user to show detailed conflicting information trigger action after, then terminal can use right The mode of ratio, shows detailed conflicting information, in order to developer can basis in the front view of the development environment of application program The detailed conflicting information of display is analyzed processing quickly and easily.

Wherein, this trigger action can be to click on, the operation such as pull, and this is not limited by the embodiment of the present invention.

It addition, this detailed conflicting information can include position and contention-resolution schemes, this Conflict solving side of conflict code Case can merge amendment record according to history, liquidates projecting by machine learning algorithm and summarizes and draw.

Such as, terminal, when this conflict code of corresponding position display, can be that developer indicates and can automatically merge Code and the code that can not automatically merge, and provide the optional mode merging code for developer, it is also possible to prompting is opened Whether the personnel of sending out contact the developer causing the m-th terminal of this conflict corresponding.

It should be noted that the embodiment of the present invention is only carrying of the code conflicts with multiple terminals and a server composition Illustrating as a example by showing system, and in actual applications, the prompt system of this code conflicts can include multiple terminal and multiple Server.

That is to say in step 401, terminal obtains code information every preset duration, and is sent by the code obtained to the One server.In step 402, first server receive the code information of N number of terminal, every preset duration second server The code information of N number of terminal is obtained from first server, and according to the code information of i-th terminal in N number of terminal, it is judged that i-th Whether the code of individual terminal meets conflict condition.In step 403, if the code of i-th terminal meets conflict condition, then Two servers generate conflicting information, and send this conflicting information to first server.In step 404, first server to I-th terminal sends this conflicting information, and i-th terminal receives and shows this conflicting information.

In sum, the reminding method of the code conflicts provided in the embodiment of the present invention, writing application journey by terminal During sequence code, obtaining code information, and code information sent to server, server receives the code of N number of terminal Information, according to the instruction of the code information of i-th terminal in N number of terminal, it is judged that whether the code of i-th terminal meets conflict bar Part, if meeting conflict condition, generating conflicting information, and sending to i-th terminal, and i-th terminal receives and shows this conflict Information.Showing this conflicting information to developer in time by terminal, developer can determine modern code easily and efficiently The situation of conflict, and in time situation for code conflicts adjusts, revises, and decreases amendment, proofreads what code was spent Time, improve efficiency.

Above-mentioned all optional technical schemes, can use and arbitrarily combine the alternative embodiment forming the present invention, at this no longer Repeat one by one.

Fig. 5 is the structural representation of the suggestion device 50 of a kind of code conflicts that the embodiment of the present invention provides, such as Fig. 5 institute Showing, the suggestion device 50 of this code conflicts is applied to server, and the suggestion device 50 of this code conflicts includes: receiver module 501, Judge module 502, generation module 503 and sending module 504.

This receiver module 501, for during N number of terminal is used for writing application code, receives this N number of terminal Code information, in this N number of terminal, the code information of i-th terminal is for indicating the code of this i-th terminal in this application journey Position in sequence code, N is positive integer, and i is any one integer in interval [1, N]；

This judge module 502, for the instruction of the code information according to this i-th terminal, it is judged that the generation of this i-th terminal Whether code meets conflict condition；

This generation module 503, for when the code of this i-th terminal meets this conflict condition, generates conflicting information；

This sending module 504, for sending this conflicting information to this i-th terminal.

In sum, the suggestion device of the code conflicts provided in the embodiment of the present invention, by writing application program generation During Ma, and sending code information to server, server receives the code information that N number of terminal obtains, according to N number of end The instruction of the code information of i-th terminal in end, it is judged that whether the code of i-th terminal meets conflict condition, if meeting punching Ridge part then generates conflicting information, and sends to i-th terminal, and i-th terminal receives and shows this conflicting information.Pass through terminal Showing this conflicting information to developer in time, developer can determine the situation of existing code conflicts easily and efficiently, and Situation for code conflicts adjusts, revises in time, decreases amendment, proofreads the time that code is spent, improves effect Rate.

This judge module 502 is additionally operable to repository address, branch and file in the code information according to this i-th terminal Directory information, it is judged that repository address, branch and the file directory information of this i-th terminal, if with in this N number of terminal The repository address of m terminal, branch are identical with file directory information, and m is any one integer in interval [1, N], and and i Difference, if repository address, branch and the file directory information of this i-th terminal and m-th terminal in this N number of terminal Repository address, branch are identical with file directory information, then meet this conflict condition.

Alternatively, the code information of this i-th terminal also includes differential file；

This generation module 503 is additionally operable to when the code of this i-th terminal meets this conflict condition, according to this i-th eventually The differential file of end, determines the code revision position of this i-th terminal, determines this i-th terminal according to this code revision position Conflict type, generate the conflicting information of this i-th terminal according to this conflict type.

Alternatively, seeing Fig. 6, this device also comprises determining that module 505.

This determines module 505, for when this conflict type include can merging type automatically time, determine that levels of conflict is first Rank；

This determines that module 505 is additionally operable to when this conflict type that include can not merging type and do not submit type of code to automatically Time, determine that this levels of conflict is second level；

This determines that module 505 is additionally operable to when this conflict type that include can not merging type and have been filed on type of code automatically Time, determine that this levels of conflict is third level；

This generation module 503 is additionally operable to generate the conflict letter of this i-th terminal according to this conflict type and this levels of conflict Breath.

This judge module 502 is additionally operable to repository address, branch and file in the code information according to this i-th terminal Directory information, it is judged that repository address, branch and the file directory information of i-th terminal, if with address, preset configuration storehouse, Preset branch identical with default file directory information, if the repository address of this i-th terminal, branch and file directory letter Cease identical with this address, preset configuration storehouse, this default branch and this default file directory information, then meet this conflict condition.

Fig. 7 is the structural representation of the suggestion device 70 of a kind of code conflicts that the embodiment of the present invention provides, such as Fig. 7 institute Showing, the suggestion device 70 of this code conflicts is applied to terminal, and the suggestion device 70 of this code conflicts includes: acquisition module 701, send out Send module 702, receiver module 703 and the first display module 704.

This acquisition module 701, for during writing application code, obtains code information, this code information For indicating the code of the terminal position in this application code；

This sending module 702, for sending this code information to server；

This receiver module 703, for receiving the conflicting information that the code of this terminal that this server sends is corresponding；

This first display module 704, for showing the conflicting information that the code of this terminal is corresponding.

In sum, the suggestion device of the code conflicts provided in the embodiment of the present invention, writing application journey by terminal During sequence code, obtain code information, and code information is sent to server, in order to server is according to the N received The instruction of the code information of i-th terminal in individual terminal, it is judged that whether the code of i-th terminal meets conflict condition, if full Foot conflict condition then generates conflicting information, and is back to i-th terminal, and i-th terminal receives and shows this conflicting information.Pass through Terminal shows this conflicting information to developer in time, and developer can determine the feelings of existing code conflicts easily and efficiently Condition, and the time that in time situation for code conflicts adjusts, revises, and decreases amendment, check and correction code is spent, raising Efficiency.

This first display module 704 is additionally operable to the levels of conflict according to this terminal and determines the color of preset pattern, is presetting This preset pattern of position display and this developer's information.

Alternatively, seeing Fig. 8, this device also includes: the second display module 705.

This second display module 705, for, after user's trigger action to the detailed conflicting information of display being detected, showing Conflicting information in detail, this detailed conflicting information includes position and the contention-resolution schemes of conflict code.

Fig. 9 is the structural representation of a kind of server 90 that the embodiment of the present invention provides, and this server 90 is applied to Fig. 1 institute In the prompt system of the code conflicts shown.Seeing Fig. 9, this server 90 includes: receptor 901, emitter 902, memorizer 903 With processor 904, this receptor 901, this emitter 902, this memorizer 903 are connected with this processor 904 respectively.

Memorizer 903, for depositing program and the code information of N number of terminal, memorizer 903 can include that cache is deposited Reservoir (cache), it is also possible to include high-speed RAM memorizer, it is also possible to include nonvolatile memory (non-volatile Memory), for example, at least one disk memory.It is understood that memorizer 903 can be random access memory (Random- Access Memory, RAM), magnetic disc, hard disk, solid state hard disc (Solid State Disk, SSD) or nonvolatile memory (non-transitory) machine readable media etc. the various non-transiences that can store program code.

Processor 904 is probably a central processor CPU, or specific integrated circuit ASIC (Application Specific Integrated Circuit), or it is configured to implement the one or more integrated electricity of the embodiment of the present invention Road.Such as, process the input/output (Input/Output, I/O) to disk and ask, the data produced in volume are backuped to mesh In mark volume etc..So that the suggestion device of code conflicts can realize the function such as I/O operation, data backup.Implement in the present invention In example, processor 904 is used for performing program, specifically can perform the correlation step in following embodiment of the method.

Program can include operating system, file system and other software modules.Different software modules has difference Function.

Wherein, processor 904 is for by receptor 901, in N number of terminal for writing the process of application code In, receiving the code information of N number of terminal, in this N number of terminal, the code information of i-th terminal is for indicating this i-th terminal Code position in this application code, N is positive integer, and i is any one integer in interval [1, N].

Processor 904 is additionally operable to the instruction of the code information according to this i-th terminal, it is judged that the code of this i-th terminal Whether meet conflict condition.

Processor 904 is additionally operable to when the code of this i-th terminal meets this conflict condition, and this server generates conflict letter Breath.

Processor 904 is additionally operable to send this conflicting information by emitter 901 to this i-th terminal.

Alternatively, processor 904 is additionally operable in the code information according to this i-th terminal repository address, branch and File directory information, it is judged that repository address, branch and the file directory information of this i-th terminal, if with this N number of terminal The repository address of middle m-th terminal, branch are identical with file directory information, and m is any one integer in interval [1, N], And it is different from i.

If processor 904 is additionally operable to repository address, branch and file directory information and this N of this i-th terminal The repository address of m-th terminal in individual terminal, branch are identical with file directory information, then meet this conflict condition.

Alternatively, processor 904 is additionally operable to when the code of this i-th terminal meets this conflict condition, this server root According to the differential file of this i-th terminal, determine the code revision position of this i-th terminal.

Processor 904 is additionally operable to determine the conflict type of this i-th terminal according to this code revision position.

Processor 904 is additionally operable to generate the conflicting information of this i-th terminal according to this conflict type.

Alternatively, processor 904 be additionally operable to when this conflict type include can merging type automatically time, determine that levels of conflict is First level.

Processor 904 be additionally operable to when this conflict type include can not merging type and when not submitting type of code to automatically, really This levels of conflict fixed is second level.

Processor 904 be additionally operable to when this conflict type include can not merging type and when having been filed on type of code automatically, really This levels of conflict fixed is third level.

Processor 904 is additionally operable to generate the conflicting information of this i-th terminal according to this conflict type and this levels of conflict.

Alternatively, processor 904 is additionally operable in the code information according to this i-th terminal repository address, branch and File directory information, it is judged that repository address, branch and the file directory information of i-th terminal, if with preset configuration storehouse Address, preset branch identical with default file directory information, if repository address, branch and the file of this i-th terminal Directory information is identical with this address, preset configuration storehouse, this default branch and this default file directory information, then meet this conflict bar Part.

Figure 10 is the structural representation of a kind of terminal 100 that the embodiment of the present invention provides, and this terminal 100 is applied to Fig. 1 institute In the prompt system of the code conflicts shown.Seeing Figure 10, this terminal 100 includes: receptor 1001, emitter 1002, memorizer 1003 and processor 1004, this receptor 1001, this emitter 1002, this memorizer 1003 are respectively with this processor 1004 even Connect.

Memorizer 1003, is used for program of depositing and data, and memorizer 1003 can include cache memory (cache), it is also possible to include high-speed RAM memorizer, it is also possible to include nonvolatile memory (non-volatile Memory), for example, at least one disk memory.It is understood that memorizer 1003 can be random access memory (Random-Access Memory, RAM), magnetic disc, hard disk, solid state hard disc (Solid State Disk, SSD) or non-volatile (non-transitory) machine readable media of the various non-transiences that can store program code such as property memorizer.

Processor 1004 is probably a central processor CPU, or specific integrated circuit ASIC (Application Specific Integrated Circuit), or it is configured to implement the one or more integrated electricity of the embodiment of the present invention Road.Such as, process the input/output (Input/Output, I/O) to disk and ask, the data produced in volume are backuped to mesh In mark volume etc..So that the suggestion device of code conflicts can realize the function such as I/O operation, data backup.Implement in the present invention In example, processor 1004 is used for performing program, specifically can perform the correlation step in following embodiment of the method.

Wherein, processor 1004, for during writing application code, obtains code information, this code information For indicating the code of the terminal position in this application code；

Processor 1004 is additionally operable to send this code information by emitter 1002 to server；

Processor 1004 is additionally operable to be received corresponding the rushing of code of this terminal that this server sends by receptor 1001 Prominent information；

Processor 1004 is additionally operable to show the conflicting information that the code of this terminal is corresponding.

Alternatively, processor 1004 is additionally operable to the levels of conflict according to this terminal and determines the color of preset pattern.

Processor 1004 is additionally operable to show this preset pattern and this developer's information at predeterminated position.

Alternatively, processor 1004 is additionally operable to when this terminal detects user's trigger action to showing detailed conflicting information After, showing detailed conflicting information, this detailed conflicting information includes position and the contention-resolution schemes of conflict code.

One of ordinary skill in the art will appreciate that all or part of step realizing above-described embodiment can pass through hardware Completing, it is also possible to instruct relevant hardware by program and complete, described program can be stored in a kind of computer-readable In storage medium, storage medium mentioned above can be read only memory, disk or CD etc..

The foregoing is only presently preferred embodiments of the present invention, not in order to limit the present invention, all spirit in the present invention and Within principle, any modification, equivalent substitution and improvement etc. made, should be included within the scope of the present invention.

Claims

1. the reminding method of a code conflicts, it is characterised in that described method includes:

During N number of terminal is used for writing application code, server receives the code information of described N number of terminal, institute State in N number of terminal the code information of i-th terminal for indicating the code of described i-th terminal in described application code Position, N is positive integer, and i is any one integer in interval [1, N]；

Described server is according to the instruction of the code information of described i-th terminal, it is judged that the code of described i-th terminal is the fullest Foot conflict condition；

Method the most according to claim 1, it is characterised in that the code information of described i-th terminal includes described i-th Repository address, branch and the file directory information that the code of terminal is corresponding；

Described server is according to the instruction of the code information of described i-th terminal, it is judged that the code of described i-th terminal is the fullest Foot conflict condition, including:

Described server, according to repository address, branch and file directory information in the code information of described i-th terminal, is sentenced Repository address, branch and the file directory information of disconnected described i-th terminal, if with m-th terminal in described N number of terminal Repository address, branch identical with file directory information, m is any one integer in interval [1, N], and different from i；

If repository address, branch and the file directory information of described i-th terminal are with m-th in described N number of terminal eventually Repository address, the branch held are identical with file directory information, then meet described conflict condition.

Method the most according to claim 1, it is characterised in that the code information of described i-th terminal also includes difference literary composition Part；

Described when the code of described i-th terminal meets described conflict condition, described server generates conflicting information, including:

When the code of described i-th terminal meets described conflict condition, described server is according to the difference of described i-th terminal File, determines the code revision position of described i-th terminal；

Method the most according to claim 3, it is characterised in that determine according to described code revision position at described server After the conflict type of described i-th terminal, described method also includes:

When described conflict type include can not merging type and when not submitting type of code to automatically, described server determines described punching Prominent rank is second level；

When described conflict type include can not merging type and when having been filed on type of code automatically, described server determines described punching Prominent rank is third level；

5. according to the method described in claim 3 or 4, it is characterised in that the conflicting information of described i-th terminal includes described The conflict type of i terminal, described i-th terminal the levels of conflict developer information corresponding with described i-th terminal in At least one.

Described server, according to repository address, branch and file directory information in the code information of described i-th terminal, is sentenced Repository address, branch and the file directory information of disconnected i-th terminal, if with address, preset configuration storehouse, preset branch and Default file directory information is identical；

If repository address, branch and the file directory information of described i-th terminal and address, described preset configuration storehouse, institute State default branch identical with described default file directory information, then meet described conflict condition.

7. the reminding method of a code conflicts, it is characterised in that described method includes:

Terminal, during being used for writing application code, obtains code information, and described code information is used for indicating terminal Code position in described application code；

Described terminal to server sends described code information；

Method the most according to claim 7, it is characterised in that described conflicting information include described terminal conflict type, At least one in developer's information that the levels of conflict of described terminal is corresponding with described terminal；

Method the most according to claim 8, it is characterised in that described method also includes:

After described terminal detects user's trigger action to the detailed conflicting information of display, show detailed conflicting information, described Conflicting information in detail includes position and the contention-resolution schemes of conflict code.

10. the suggestion device of a code conflicts, it is characterised in that described device includes:

Receiver module, for during N number of terminal is used for writing application code, receives the code of described N number of terminal Information, in described N number of terminal, the code information of i-th terminal is for indicating the code of described i-th terminal in described application journey Position in sequence code, N is positive integer, and i is any one integer in interval [1, N]；

Judge module, for the instruction of the code information according to described i-th terminal, it is judged that the code of described i-th terminal is No meet conflict condition；

11. devices according to claim 10, it is characterised in that the code information of described i-th terminal includes described i-th Repository address, branch and the file directory information that the code of individual terminal is corresponding；

Described judge module is additionally operable to repository address, branch and file mesh in the code information according to described i-th terminal Record information, it is judged that repository address, branch and the file directory information of described i-th terminal, if with in described N number of terminal The repository address of m-th terminal, branch are identical with file directory information, and m is any one integer in interval [1, N], and Different from i, if repository address, branch and the file directory information of described i-th terminal and m in described N number of terminal The repository address of individual terminal, branch are identical with file directory information, then meet described conflict condition.

12. devices according to claim 10, it is characterised in that the code information of described i-th terminal also includes difference File；

Described generation module is additionally operable to when the code of described i-th terminal meets described conflict condition, according to described i-th eventually The differential file of end, determines the code revision position of described i-th terminal, determines described i-th according to described code revision position The conflict type of individual terminal, generates the conflicting information of described i-th terminal according to described conflict type.

13. devices according to claim 12, it is characterised in that described device also includes:

Determine module, for when described conflict type include can merging type automatically time, determine that levels of conflict is first level；

Described determine module be additionally operable to when described conflict type include can not merging type and when not submitting type of code to automatically, really Fixed described levels of conflict is second level；

Described determine module be additionally operable to when described conflict type include can not merging type and when having been filed on type of code automatically, really Fixed described levels of conflict is third level；

Described generation module is additionally operable to generate the conflict letter of described i-th terminal according to described conflict type and described levels of conflict Breath.

14. according to the device described in claim 12 or 13, it is characterised in that the conflicting information of described i-th terminal includes institute State the conflict type of i-th terminal, described i-th terminal levels of conflict corresponding with described i-th terminal developer letter At least one in breath.

15. devices according to claim 10, it is characterised in that the code information of described i-th terminal includes described i-th Repository address, branch and the file directory information that the code of individual terminal is corresponding；

Described judge module is additionally operable to repository address, branch and file mesh in the code information according to described i-th terminal Record information, it is judged that repository address, branch and the file directory information of i-th terminal, if with address, preset configuration storehouse, pre- If branch is identical with default file directory information, if the repository address of described i-th terminal, branch and file directory letter Cease identical with address, described preset configuration storehouse, described default branch and described default file directory information, then meet described conflict Condition.

The suggestion device of 16. 1 kinds of code conflicts, it is characterised in that described device includes:

Acquisition module, for during writing application code, obtains code information, and described code information is used for indicating The code of terminal position in described application code；

Sending module, for sending described code information to server；

17. devices according to claim 16, it is characterised in that described conflicting information includes the conflict class of described terminal Type, described terminal the levels of conflict developer information corresponding with described terminal at least one；

Described first display module is additionally operable to the levels of conflict according to described terminal and determines the color of preset pattern, at predeterminated position Show described preset pattern and described developer's information.

18. devices according to claim 17, it is characterised in that described device also includes:

Second display module, for after user's trigger action to the detailed conflicting information of display being detected, display conflicts in detail Information, described detailed conflicting information includes position and the contention-resolution schemes of conflict code.