CN109670151A - File mergences method, apparatus and storage medium - Google Patents
File mergences method, apparatus and storage medium Download PDFInfo
- Publication number
- CN109670151A CN109670151A CN201811489926.6A CN201811489926A CN109670151A CN 109670151 A CN109670151 A CN 109670151A CN 201811489926 A CN201811489926 A CN 201811489926A CN 109670151 A CN109670151 A CN 109670151A
- Authority
- CN
- China
- Prior art keywords
- file
- modification
- original document
- data
- user
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Pending
Links
Classifications
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F40/00—Handling natural language data
- G06F40/10—Text processing
- G06F40/197—Version control
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F40/00—Handling natural language data
- G06F40/10—Text processing
- G06F40/194—Calculation of difference between files
Abstract
The present invention provides a kind of file mergences method, apparatus and storage medium, by obtaining original document, the first modification file and the second modification file, wherein the first modification file and the second modification file are respectively the file that the first user and second user make identical or different data manipulation in synchronization to original document；First data manipulation of first user to original document is determined according to original document and the first modification file, and second data manipulation of the second user to original document is determined according to original document and the second modification file；Consolidation strategy is operated according to preset data, original document, the first modification file and the second modification file are merged.The solution speed that file mergences conflict is improved by the above method, realizes automatic merging process, greatly reduces the error rate manually merged.
Description
Technical field
The present embodiments relate to art file management technology field more particularly to a kind of file mergences method, apparatus and storages
Medium.
Background technique
The tool of mainstream is SVN (Subversion) in Version, usually handles document code using the tool
Merging, however the tool and be bad to handle the merging of binary file, such as EXCEL file is exactly a zip format
Binary file, SVN cannot normally merge EXCEL file.
At present during development of games, EXCEL file is often used, the game developer of different phase can be submitted
A large amount of EXCEL modifies file, and when submission file mergences conflict occurs and always can hardly be avoided.Wherein, file mergences conflict is usual
Occur when file of the different user to same version is modified simultaneously.At this moment file can only be modified by manually going to merge,
It is time-consuming and laborious, and it is easy error.
The existing tool handled EXCEL file can only compare the difference of two EXCEL files, for phase
Pass personnel are with reference to use, such as the Spreadsheet Compare tool in Office suite.However to pair of EXCEL file
Than can not achieve the automatic merging to EXCEL file.
Summary of the invention
The present invention provides a kind of file mergences method, apparatus and storage medium, realizes the automatic merging to file.
The first aspect of the present invention provides a kind of file mergences method, comprising:
Obtain original document, the first modification file and the second modification file；The first modification file and described second
Modification file, which is respectively the first user and second user, makes identical or different data to the original document in synchronization and grasps
The file of work；
Determine first user to the of the original document according to the original document and the first modification file
One data manipulation, and determine the second user to the original text according to the original document and the second modification file
Second data manipulation of part；
Consolidation strategy is operated according to preset data, to the original document, the first modification file and described second
Modification file merges.
In one possible implementation, the determination first user grasps the first data of the original document
Make and the second user to the second data manipulation of the original document before, the method also includes:
Extract the first data of the original document, the second data of the first modification file and second modification
Third data in file；
First data, second data and the third data are subjected to matrixing processing, obtain the original
Corresponding first matrix of beginning file, second modification corresponding second matrix of file and third modification file are corresponding
Third matrix.
In one possible implementation, the determination first user grasps the first data of the original document
The second data manipulation of work and the second user to the original document, comprising:
First matrix and second matrix are compared, determines first user to the first number of the original document
According to operation；
First matrix and the third matrix are compared, determines the second user to the second number of the original document
According to operation.
In one possible implementation, first data manipulation and second data manipulation include increasing behaviour
At least one of work, delete operation, modification operation.
In one possible implementation, described that consolidation strategy is operated according to preset data, to the original document, institute
It states the first modification file and the second modification file merges, comprising:
If first data manipulation and second data manipulation are to increase operation or delete operation, to described
Original document, the first modification file and the second modification file merge；
In one possible implementation, described that consolidation strategy is operated according to preset data, to the original document, institute
It states the first modification file and the second modification file merges, comprising:
If first data manipulation and second data manipulation are modification operation；Alternatively, the first data behaviour
As delete operation, second data manipulation is modification operation；Alternatively, first data manipulation is modification operation, it is described
Second data manipulation is delete operation, then sends file conflict prompting message；
File mergences instruction is received, according to file mergences instruction to the original document, the first modification file
And the second modification file merges.
In one possible implementation, the original document, the first modification file and second modification
File is EXCEL file.
The second aspect of the present invention provides a kind of file mergences device, comprising:
Module is obtained, for obtaining original document, the first modification file and the second modification file；The first modification text
Part and it is described second modification file be respectively the first user and second user the original document is made in synchronization it is identical
Or the file of different data operation；
Determining module, for determining first user to described according to the original document and the first modification file
First data manipulation of original document, and the second user is determined according to the original document and the second modification file
The second data manipulation to the original document；
Merging module, for operating consolidation strategy according to preset data, to the original document, the first modification file
And the second modification file merges.
The third aspect of the present invention provides a kind of file mergences device, comprising:
Memory；
Processor；And
Computer program；
Wherein, the computer program stores in the memory, and is configured as being executed by the processor with reality
Now such as the described in any item methods of first aspect present invention.
The fourth aspect of the present invention provides a kind of computer readable storage medium, is stored thereon with computer program, described
Computer program is executed by processor to realize such as the described in any item methods of first aspect present invention.
The embodiment of the present invention provides a kind of file mergences method, apparatus and storage medium, passes through and obtains original document, first
File and the second modification file are modified, wherein the first modification file and the second modification file are respectively that the first user and second are used
The file of identical or different data manipulation is made to original document in synchronization in family；According to original document and the first modification file
It determines first data manipulation of first user to original document, and the second use is determined according to original document and the second modification file
Second data manipulation of the family to original document；According to preset data operate consolidation strategy, to original document, first modification file with
And second modification file merge.The solution speed of file mergences conflict is improved by the above method, realization merged automatically
Journey greatly reduces the error rate manually merged.
Detailed description of the invention
In order to more clearly explain the embodiment of the invention or the technical proposal in the existing technology, to embodiment or will show below
There is attached drawing needed in technical description to be briefly described, it should be apparent that, the accompanying drawings in the following description is this hair
Bright some embodiments for those of ordinary skill in the art without any creative labor, can be with
It obtains other drawings based on these drawings.
Fig. 1 is the flow diagram for the file mergences method that one embodiment of the invention provides；
Fig. 2 is the schematic diagram for the file conflict prompting interface that one embodiment of the invention provides；
Fig. 3 be another embodiment of the present invention provides file mergences method flow diagram；
Fig. 4 is the structural schematic diagram for the file mergences device that one embodiment of the invention provides；
Fig. 5 be another embodiment of the present invention provides text merge device structural schematic diagram；
Fig. 6 is the hardware structural diagram for the file mergences device that one embodiment of the invention provides.
Specific embodiment
In order to make the object, technical scheme and advantages of the embodiment of the invention clearer, below in conjunction with the embodiment of the present invention
In attached drawing, technical scheme in the embodiment of the invention is clearly and completely described, it is clear that described embodiment is
A part of the embodiment of the present invention, instead of all the embodiments.Based on the embodiments of the present invention, those of ordinary skill in the art
Every other embodiment obtained without creative efforts, shall fall within the protection scope of the present invention.
Description and claims of this specification and term " first " in above-mentioned attached drawing, " second " etc. are for distinguishing
Similar object, without being used to describe a particular order or precedence order.It should be understood that the data used in this way are in appropriate feelings
It can be interchanged under condition, so that the embodiment of the present invention described herein can be other than those of illustrating or describing herein
Sequence implement.
It should be appreciated that term " includes " used herein and " having " and their any deformation, it is intended that cover
Cover it is non-exclusive include, for example, the process, method, system, product or equipment for containing a series of steps or units are not necessarily limited to
Step or unit those of is clearly listed, but may include be not clearly listed or for these process, methods, product
Or other step or units that equipment is intrinsic.
File mergences method provided in an embodiment of the present invention, in conjunction with Version SVN to file (especially EXCEL
File) it merges, by way of converting matrix for list data, determining data are compared to different editions file and are grasped
Make type, and consolidation strategy is operated according to preset data, different editions file is merged automatically, and combine people if necessary
Work merges to avoid merging and conflict manually.By file mergences method provided by the embodiment, the solution of file mergences conflict is improved
Certainly speed realizes automation merging process, greatly reduces the error rate manually merged.
Technical solution of the present invention is described in detail with specifically embodiment below.These specific implementations below
Example can be combined with each other, and the same or similar concept or process may be repeated no more in some embodiments.
Fig. 1 is the flow diagram for the file mergences method that one embodiment of the invention provides, and Fig. 2 is one embodiment of the invention
The schematic diagram of the file conflict prompting interface of offer.
Method provided in this embodiment can be executed by arbitrarily executing the device of file mergences method, which can lead to
Cross software and or hardware realization.As shown in Figure 1, file mergences method provided by the embodiment includes the following steps:
S101, original document, the first modification file and the second modification file are obtained；
In the present embodiment, the first modification file and the second modification file are respectively the first user and second user in same a period of time
Carve the file that identical or different data manipulation is made to original document.
The file of the present embodiment is EXCEL file.
Wherein, data manipulation includes at least one for increasing operation, delete operation, modification operation.
Optionally, original document, the first modification file and the second modification file are obtained by Version.
Management Version in this implementation is specially SVN, and SVN can save user to original document each time
The data such as the document code of modification.
SVN is centralized code administration, and core must before starting new darg in server, all developers
Code file must be obtained from server, then developed, finally solved conflict and submit new version.All version informations are all placed on clothes
Be engaged in device on, developer can check on the server before FileVersion, the version before can also returning back to.
S102, determine the first user to the first data manipulation of original document and second user to the of original document
Two data manipulations；
After obtaining original document, the first modification file and the second modification file, is compared by file, determine first
The first data manipulation of user and the second data manipulation of second user.
Specifically, by comparing original document and the first modification file, determine the first user to the first of original document
Data manipulation.Wherein, the first data manipulation includes at least one for increasing operation, delete operation, modification operation.
File is modified by comparing original document and second, determines second data manipulation of the second user to original document,
Wherein, the second data manipulation includes at least one for increasing operation, delete operation, modification operation.
S103, consolidation strategy is operated according to preset data, to original document, the first modification file and the second modification file
It merges.
In the present embodiment, determining the first user to the first data manipulation of original document and second user to original
After second data manipulation of file, according to the type of the first data manipulation and the second data manipulation, merging is judged whether there is
Conflict merges conflict if it does not exist, then directly merges to original document, the first modification file and the second modification file；
Merge conflict if it exists, then send file conflict prompting message to client, carries out manual confirmation.
In a kind of possible situation, the first data manipulation and the second data manipulation are to increase operation, then there is no close
And conflict, directly original document, the first modification file and the second modification file are merged.
In the case where alternatively possible, the first data manipulation and the second data manipulation are delete operation, then are not present
Merge conflict, directly original document, the first modification file and the second modification file are merged.
In another possible situation, the first data manipulation is delete operation, and the second data manipulation is modification operation, or
The first data manipulation of person is modification operation, and the second data manipulation is delete operation, then exists and merge conflict, needs to send out to client
File conflict prompting message is sent, manual confirmation is carried out.
In the case where alternatively possible, the first data manipulation and the second data manipulation are modification operation, then exist and close
And conflict, it needs to send file conflict prompting message to client, carries out manual confirmation.
It is above-mentioned need manual confirmation when, client will pop up a file conflict prompting interface, as shown in Fig. 2, file
It include the current initial data for merging conflict, the first modification data, the second modification data, every number in the prompting interface 201 that conflicts
According to rear setting " use " button, user may be selected using the first modification data, the second modification data or initial data (i.e. not into
Any modification of row), " completing to merge " button is clicked after selection, submits current merge.
It optionally, further include the multiple merging conflicts for submitting the moment in file conflict prompting interface 201, it is corresponding, it is setting
After setting current merging conflict, user can click " last conflict " or " next conflict " on interface, complete to rush multiple merging
Multiple merging are finally submitted in prominent centralized processing.
File mergences method provided in an embodiment of the present invention, by obtaining original document, the first modification file and second
Modify file, wherein first modification file and second modification file be respectively the first user and second user in synchronization to original
Beginning file makes the file of identical or different data manipulation；Determine the first user to original according to original document and the first modification file
First data manipulation of beginning file, and determine second user to the of original document according to original document and the second modification file
Two data manipulations；According to preset data operate consolidation strategy, to original document, first modification file and second modification file into
Row merges.The solution speed that file mergences conflict is improved by the above method, realizes automatic merging process, greatly reduces artificial
Combined error rate.
On the basis of the above embodiments, how file mergences method combination example provided in this embodiment is to according to SVN
Processing EXCEL file merging is described in detail, and realizes SVN to the pooling function of EXCEL file.
File mergences method provided by the embodiment is described in detail with reference to the accompanying drawing.
Fig. 3 be another embodiment of the present invention provides file mergences method flow diagram, as shown in figure 3, this implementation
The file mergences method of example includes the following steps:
S301, original document, the first modification file and the second modification file are obtained；
Wherein, first modification file and second modification file be respectively the first user and second user in synchronization to original
Beginning file makes the file of identical or different data manipulation；
The implementing principle and technical effect of S101 of S301 and above-described embodiment of the present embodiment are identical, referring specifically to above-mentioned
Embodiment, details are not described herein again.
S302, the first data for extracting original document, the second data of the first modification file and second modify file
Third data；
Original document, the first modification file and the second modification file are EXCEL file in the present embodiment, are extracted
Data in EXCEL file.The all corresponding number of data in usual Microsoft Excel, to form the record of EXCEL file
Dictionary.
For example, the original document during certain development of games is as shown in table 1.
Table 1
| Technical ability number | Skill designations | Injury values |
| 1 | It drifts about | 1.5 |
| 2 | It steals | 0 |
| 3 | Dice | 1000 |
| 4 | Retinue | 0 |
Different modifications is made to table 1 in synchronization different user, as shown in table 2 and table 3, wherein table 2 is the first use
Family modify to table 1 after tables of data, table 3 be second user modify to table 1 after tables of data.
Table 2
| Technical ability number | Skill designations | Injury values |
| 1 | It drifts about | 1.5 |
| 2 | It steals | 0 |
| 3 | Dice | 500 |
| 4 | Retinue | 0 |
Table 3
| Technical ability number | Skill designations | Injury values |
| 1 | It drifts about | 1.5 |
| 2 | It steals | 0 |
| 3 | Dice | 1500 |
| 4 | Retinue | 0 |
For table 1, " technical ability number " correspondence " 0 " in dictionary is recorded, " skill designations " correspondence " 1 ", " injury values " are corresponding
"3"；" 1 " correspondence " 4 " ..., and so on.
S303, the first data, the second data and third data are subjected to matrixing processing, it is corresponding obtains original document
First matrix, corresponding second matrix of the second modification file and the corresponding third matrix of third modification file；
According to above-mentioned record dictionaries, the first data are subjected to matrixing processing, obtain corresponding first matrix of original document:
Wherein, corresponding " 11 " in the first matrix are " 1000 ".
Second data are subjected to matrixing processing, obtain corresponding second matrix of the first modification file:
Wherein, corresponding " 14 " in the second matrix are " 500 ".
Third data are subjected to matrixing processing, obtain the corresponding third matrix of the second modification file:
Wherein, corresponding " 15 " in third matrix are " 1500 ".
S304, the first matrix and the second matrix are compared, determines first data manipulation of first user to original document, compared
First matrix and third matrix determine second data manipulation of the second user to original document；
By comparing the first matrix and the second matrix, the additions and deletions of row/column and the modification of numerical value in matrix are determined, thus really
Fixed first data manipulation of first user to original document.
Likewise, by comparing the first matrix and third matrix, repairing for additions and deletions of row/column in matrix and data is determined
Change, so that it is determined that second data manipulation of the second user to original document.
Based on upper example, it can determine that the first user is the corresponding injury of dice to the skill designations in original Microsoft Excel
Value is modified, and is revised as 500 for 1000；Synchronization, second user are dice to the skill designations in original Microsoft Excel
The corresponding injury values of son are modified, and are revised as 1500 for 1000.
S305, consolidation strategy is operated according to preset data, to original document, the first modification file and the second modification file
It merges.
The implementing principle and technical effect of S103 of S305 and above-described embodiment of the present embodiment are identical, referring specifically to above-mentioned
Embodiment, details are not described herein again.
Based on upper example, it can determine the first data manipulation and the second data manipulation is modification operation, according to preset data
Consolidation strategy is operated, determines at this time there is merging conflict, needs to send file conflict prompting message to client, is carried out artificial true
Recognize.As shown in Fig. 2, client will pop up a file conflict prompting interface 201, wherein initial data column shows that injury values are
" 1000 ", the first modification field show that injury values are " 500 ", and the second modification field shows that injury values are " 1500 ", user
It may be selected to click " completing to merge " button after selection using the first modification data or the second modification data or initial data,
Submit current merge.
File mergences method provided in an embodiment of the present invention, by obtaining original document, the first modification file and second
Modify file, wherein first modification file and second modification file be respectively the first user and second user in synchronization to original
Beginning file makes the file of identical or different data manipulation；The second of first data of extraction original document, the first modification file
Data are carried out matrixing processing, obtain corresponding first square of original document by the third data of data and the second modification file
Battle array, the first corresponding second matrix of modification file and the corresponding third matrix of third modification file compare the first matrix and the
Two matrixes determine first data manipulation of first user to original document, compare the first matrix and third matrix determines second user
The second data manipulation to original document；Consolidation strategy is finally operated according to preset data, to original document, the first modification file
And second modification file merge.The solution speed of file mergences conflict is improved by the above method, realizes automatic merge
Process greatly reduces the error rate manually merged.
Fig. 4 is the structural schematic diagram for the file mergences device that one embodiment of the invention provides, as shown in figure 4, the present embodiment
The file mergences device 40 of offer includes:
Module 41 is obtained, for obtaining original document, the first modification file and the second modification file；First modification
File and the second modification file are respectively that the first user and second user in synchronization make phase to the original document
The file of same or different data operation；
Determining module 42, for determining first user to the original text according to original document and the first modification file
First data manipulation of part, and determine the second user to the original document according to original document and the second modification file
The second data manipulation；
Merging module 43, for operating consolidation strategy according to preset data, to the original document, the first modification text
Part and the second modification file merge.
File mergences device provided in an embodiment of the present invention, including module, determining module and merging module are obtained,
In, module is obtained for obtaining original document, the first modification file and the second modification file；First modification file and second is repaired
Changing file is respectively the text that the first user and second user make identical or different data manipulation in synchronization to original document
Part；Determining module is used to determine that the first user grasps the first data of original document according to original document and the first modification file
Make, and second data manipulation of the second user to original document is determined according to original document and the second modification file；Merge mould
Block is used to operate consolidation strategy according to preset data, closes to original document, the first modification file and the second modification file
And.Above-mentioned file mergences device improves the solution speed of file mergences conflict, realizes automatic merging process, greatly reduces people
The error rate that work merges.
On the basis of the above embodiments, on the basis of the above embodiments, Fig. 5 be another embodiment of the present invention provides
The structural schematic diagram of file mergences device, on the basis of device shown in Fig. 4, as shown in figure 5, file provided in this embodiment closes
And device 40, further includes: extraction module 44, data processing module 45.
Optionally, the acquisition module, is specifically used for: obtaining original document, the first user by Version SVN
File and second user, which are modified, to the first of the original document modifies file to the second of the original document.
Optionally, the extraction module 44, for determining first user to the first data of the original document
Operation and the second user to the second data manipulation of the original document before, extract the first of the original document
Third data in data, the second data of the first modification file and the second modification file；
The data processing module 45, for by first data, second data and the third data into
Row matrixization processing, obtain corresponding first matrix of the original document, second corresponding second matrix of modification file with
And the third modifies the corresponding third matrix of file.
Optionally, the determining module 42 is specifically used for comparing first matrix and second matrix, determine described in
First data manipulation of first user to the original document；Compare first matrix and the third matrix, determine described in
Second data manipulation of the second user to the original document.
Optionally, first data manipulation and second data manipulation include increasing operation, delete operation, modification behaviour
At least one of make.
Optionally, the merging module 43, is specifically used for:
If first data manipulation and second data manipulation be increase operation or delete operation, by pair
The original document, the first modification file and the second modification file merge；
Optionally, the merging module 43, is specifically used for:
If first data manipulation and second data manipulation are modification operation；Alternatively, the first data behaviour
As delete operation, second data manipulation is modification operation；Alternatively, first data manipulation is modification operation, it is described
Second data manipulation is delete operation, then sends file conflict prompting message；
File mergences instruction is received, according to file mergences instruction to the original document, the first modification file
And the second modification file merges.
Optionally, the original document, the first modification file and the second modification file are EXCEL text
Part.
File mergences device provided in this embodiment can execute the technical solution of above method embodiment, realize former
Reason is similar with technical effect, and details are not described herein again.
Fig. 6 is the hardware structural diagram for the file mergences device that one embodiment of the invention provides, as shown in fig. 6, this reality
Apply the file mergences device 60 of example, comprising:
Memory 61；
Processor 62；And
Computer program；
Wherein, computer program is stored in memory 61, and is configured as being executed by processor 62 to realize as aforementioned
The technical solution of any one embodiment of the method, it is similar that the realization principle and technical effect are similar, and details are not described herein again.
Optionally, memory 61 can also be integrated with processor 62 either independent.
When device except memory 61 is independently of processor 62, file mergences device 60 further include:
Bus 63, for connecting memory 61 and processor 62.
The embodiment of the present invention also provides a kind of computer readable storage medium, is stored thereon with computer program, computer
Program is executed by processor 62 to realize each step performed by file mergences device 60 in embodiment of the method as above.
In several embodiments provided by the present invention, it should be understood that disclosed device and method can pass through it
Its mode is realized.For example, apparatus embodiments described above are merely indicative, for example, the division of module, only
A kind of logical function partition, there may be another division manner in actual implementation, such as multiple modules can combine or can be with
It is integrated into another system, or some features can be ignored or not executed.Another point, it is shown or discussed mutual
Coupling, direct-coupling or communication connection can be through some interfaces, the indirect coupling or communication connection of device or module, can
To be electrically mechanical or other forms.
Module may or may not be physically separated as illustrated by the separation member, show as module
Component may or may not be physical unit, it can and it is in one place, or may be distributed over multiple networks
On unit.Some or all of the modules therein can be selected to achieve the purpose of the solution of this embodiment according to the actual needs.
It, can also be in addition, each functional module in each embodiment of the present invention can integrate in one processing unit
It is that modules physically exist alone, can also be integrated in one unit with two or more modules.Above-mentioned module at
Unit both can take the form of hardware realization, can also realize in the form of hardware adds SFU software functional unit.
The above-mentioned integrated module realized in the form of software function module, can store and computer-readable deposit at one
In storage media.Above-mentioned software function module is stored in a storage medium, including some instructions are used so that a computer
Equipment (can be personal computer, server or the network equipment etc.) or processor (English: processor) execute this Shen
Please each embodiment method part steps.
It should be understood that above-mentioned processor can be central processing unit (English: Central Processing Unit, letter
Claim: CPU), can also be other general processors, digital signal processor (English: Digital Signal Processor,
Referred to as: DSP), specific integrated circuit (English: Application Specific Integrated Circuit, referred to as:
ASIC) etc..General processor can be microprocessor or the processor is also possible to any conventional processor etc..In conjunction with hair
The step of bright disclosed method, can be embodied directly in hardware processor and execute completion, or with hardware in processor and soft
Part block combiner executes completion.
Memory may include high speed RAM memory, it is also possible to and it further include non-volatile memories NVM, for example, at least one
Magnetic disk storage can also be USB flash disk, mobile hard disk, read-only memory, disk or CD etc..
Bus can be industry standard architecture (Industry Standard Architecture, ISA) bus, outer
Portion's apparatus interconnection (Peripheral Component, PCI) bus or extended industry-standard architecture (Extended
Industry Standard Architecture, EISA) bus etc..Bus can be divided into address bus, data/address bus, control
Bus etc..For convenient for indicating, the bus in illustrations does not limit only a bus or a type of bus.
Above-mentioned storage medium can be by any kind of volatibility or non-volatile memory device or their combination
It realizes, such as static random access memory (SRAM), electrically erasable programmable read-only memory (EEPROM), erasable programmable
Read-only memory (EPROM), programmable read only memory (PROM), read-only memory (ROM), magnetic memory, flash memory,
Disk or CD.Storage medium can be any usable medium that general or specialized computer can access.
A kind of illustrative storage medium is coupled to processor, believes to enable a processor to read from the storage medium
Breath, and information can be written to the storage medium.Certainly, storage medium is also possible to the component part of processor.It processor and deposits
Storage media can be located at specific integrated circuit (Application Specific Integrated Circuits, referred to as:
ASIC in).Certainly, pocessor and storage media can also be used as discrete assembly and be present in electronic equipment or main control device.
Finally, it should be noted that the above embodiments are only used to illustrate the technical solution of the present invention., rather than its limitations；To the greatest extent
Pipe present invention has been described in detail with reference to the aforementioned embodiments, those skilled in the art should understand that: its according to
So be possible to modify the technical solutions described in the foregoing embodiments, or to some or all of the technical features into
Row equivalent replacement；And these are modified or replaceed, various embodiments of the present invention technology that it does not separate the essence of the corresponding technical solution
The range of scheme.
Claims (10)
1. a kind of file mergences method characterized by comprising
Obtain original document, the first modification file and the second modification file；The first modification file and second modification
File is respectively that the first user and second user in synchronization make identical or different data manipulation to the original document
File；
Determine first user to the first number of the original document according to the original document and the first modification file
Determine the second user to the original document according to operation, and according to the original document and the second modification file
Second data manipulation；
Consolidation strategy is operated according to preset data, to the original document, the first modification file and second modification
File merges.
2. the method according to claim 1, wherein the determination first user is to the original document
Before first data manipulation and the second user are to the second data manipulation of the original document, the method also includes:
Extract the first data of the original document, the second data of the first modification file and the second modification file
In third data；
First data, second data and the third data are subjected to matrixing processing, obtain the original text
Corresponding first matrix of part, second modification corresponding second matrix of file and the corresponding third of third modification file
Matrix.
3. according to the method described in claim 2, it is characterized in that, the determination first user is to the original document
The second data manipulation of first data manipulation and the second user to the original document, comprising:
First matrix and second matrix are compared, determines that first user grasps the first data of the original document
Make；
First matrix and the third matrix are compared, determines that the second user grasps the second data of the original document
Make.
4. according to the method described in claim 1, first data manipulation and second data manipulation include increase operation,
At least one of delete operation, modification operation.
5. according to the method described in claim 4, it is characterized in that, described operate consolidation strategy according to preset data, to described
Original document, the first modification file and the second modification file merge, comprising:
If first data manipulation and second data manipulation are to increase operation or delete operation, to described original
File, the first modification file and the second modification file merge.
6. according to the method described in claim 4, it is characterized in that, described operate consolidation strategy according to preset data, to described
Original document, the first modification file and the second modification file merge, comprising:
If first data manipulation and second data manipulation are modification operation；Alternatively, first data manipulation is
Delete operation, second data manipulation are modification operation；Alternatively, first data manipulation is that modification operates, described second
Data manipulation is delete operation, then sends file conflict prompting message；
Receive file mergences instruction, according to the file mergences instruction to the original document, it is described first modification file and
The second modification file merges.
7. method according to any one of claims 1 to 6, which is characterized in that the original document, the first modification text
Part and the second modification file are EXCEL file.
8. a kind of file mergences device characterized by comprising
Module is obtained, for obtaining original document, the first modification file and the second modification file；It is described first modification file and
The second modification file is respectively the first user and second user the original document is made in synchronization it is identical or not
With the file of data manipulation；
Determining module, for determining first user to described original according to the original document and the first modification file
First data manipulation of file, and determine the second user to institute according to the original document and the second modification file
State the second data manipulation of original document；
Merging module, for according to preset data operate consolidation strategy, to the original document, it is described first modification file and
The second modification file merges.
9. a kind of file mergences device characterized by comprising
Memory；
Processor；And
Computer program；
Wherein, the computer program stores in the memory, and is configured as being executed by the processor to realize such as
The described in any item methods of claim 1 to 7.
10. a kind of computer readable storage medium, which is characterized in that be stored thereon with computer program, the computer program
It is executed by processor to realize method as described in any one of claim 1 to 7.
Priority Applications (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201811489926.6A CN109670151A (en) | 2018-12-06 | 2018-12-06 | File mergences method, apparatus and storage medium |
Applications Claiming Priority (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201811489926.6A CN109670151A (en) | 2018-12-06 | 2018-12-06 | File mergences method, apparatus and storage medium |
Publications (1)
| Publication Number | Publication Date |
|---|---|
| CN109670151A true CN109670151A (en) | 2019-04-23 |
Family
ID=66143671
Family Applications (1)
| Application Number | Title | Priority Date | Filing Date |
|---|---|---|---|
| CN201811489926.6A Pending CN109670151A (en) | 2018-12-06 | 2018-12-06 | File mergences method, apparatus and storage medium |
Country Status (1)
| Country | Link |
|---|---|
| CN (1) | CN109670151A (en) |
Cited By (1)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN113110868A (en) * | 2021-04-07 | 2021-07-13 | 网易（杭州）网络有限公司 | File merging method and device, computer equipment and storage medium |
Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN102999482A (en) * | 2011-12-12 | 2013-03-27 | 微软公司 | Technique for managing collaborative documents |
| CN104123126A (en) * | 2013-04-26 | 2014-10-29 | 阿里巴巴集团控股有限公司 | Method and device for generating merge conflict record list |
| CN106775623A (en) * | 2016-11-17 | 2017-05-31 | 网易（杭州）网络有限公司 | Plan the processing method and processing device of allocation list |
| CN108446394A (en) * | 2018-03-26 | 2018-08-24 | 网易（杭州）网络有限公司 | The control methods of file difference and device |
-
2018
- 2018-12-06 CN CN201811489926.6A patent/CN109670151A/en active Pending
Patent Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN102999482A (en) * | 2011-12-12 | 2013-03-27 | 微软公司 | Technique for managing collaborative documents |
| CN104123126A (en) * | 2013-04-26 | 2014-10-29 | 阿里巴巴集团控股有限公司 | Method and device for generating merge conflict record list |
| CN106775623A (en) * | 2016-11-17 | 2017-05-31 | 网易（杭州）网络有限公司 | Plan the processing method and processing device of allocation list |
| CN108446394A (en) * | 2018-03-26 | 2018-08-24 | 网易（杭州）网络有限公司 | The control methods of file difference and device |
Cited By (2)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN113110868A (en) * | 2021-04-07 | 2021-07-13 | 网易（杭州）网络有限公司 | File merging method and device, computer equipment and storage medium |
| CN113110868B (en) * | 2021-04-07 | 2023-08-08 | 网易（杭州）网络有限公司 | File merging method, device, computer equipment and storage medium |
Similar Documents
| Publication | Publication Date | Title |
|---|---|---|
| CN108153897B (en) | PLSQL program code generation method and system | |
| CN110096263A (en) | Web front end code automatic generation method and device | |
| CN108536745B (en) | Shell-based data table extraction method, terminal, equipment and storage medium | |
| WO2020259035A1 (en) | Service code generating and executing methods and devices | |
| CN103310460A (en) | Image characteristic extraction method and system | |
| CN111310232A (en) | Data desensitization method and device, electronic equipment and storage medium | |
| CN110362295A (en) | Code generating method, device, computer installation and storage medium | |
| CN102279855A (en) | Device and method for treating transactions with database | |
| CN109670151A (en) | File mergences method, apparatus and storage medium | |
| CN112506869A (en) | File processing method, device and system | |
| CN108829882B (en) | Information collection method, device, terminal and medium | |
| CN107392745B (en) | Reconciliation data fragmentation processing method | |
| CN112256844A (en) | Text classification method and device | |
| CN114757299A (en) | Text similarity judgment method and device and storage medium | |
| CN113506035A (en) | Method, device and equipment for determining approval process | |
| CN111966286A (en) | Multi-data pool hierarchical migration method and system | |
| CN109460346A (en) | A kind of method, apparatus and storage medium of offline analysis feature data | |
| WO2019100646A1 (en) | Method, electronic device, and storage medium for splitting and calling rule engine file | |
| CN111027196A (en) | Simulation analysis task processing method and device for power equipment and storage medium | |
| CN110703988A (en) | Storage pool creating method, system, terminal and storage medium for distributed storage | |
| CN110609988A (en) | Form verification method and equipment | |
| CN110460987A (en) | A kind of card writing method, device, server and storage medium | |
| CN110069595A (en) | Corpus label determines method, apparatus, electronic equipment and storage medium | |
| CN115599838B (en) | Data processing method, device, equipment and storage medium based on artificial intelligence | |
| CN109002287B (en) | Management method and device for software in cloud data system |
Legal Events
| Date | Code | Title | Description |
|---|---|---|---|
| PB01 | Publication | ||
| PB01 | Publication | ||
| SE01 | Entry into force of request for substantive examination | ||
| SE01 | Entry into force of request for substantive examination |