File merging method and device and storage medium

A file and storage technology, applied in the field of devices, storage media, and file merging methods, can solve problems such as the inability to realize automatic merging of EXCEL files.

Pending Publication Date: 2019-04-23
NETEASE (HANGZHOU) NETWORK CO LTD
View PDF4 Cites 2 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

However, the comparison of EXCEL files cannot

Method used

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
View more

Image

Smart Image Click on the blue labels to locate them in the text.
Viewing Examples
Smart Image
  • File merging method and device and storage medium
  • File merging method and device and storage medium
  • File merging method and device and storage medium

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0041] In order to make the purpose, technical solutions and advantages of the embodiments of the present invention clearer, the technical solutions in the embodiments of the present invention will be clearly and completely described below in conjunction with the drawings in the embodiments of the present invention. Obviously, the described embodiments It is a part of embodiments of the present invention, but not all embodiments. Based on the embodiments of the present invention, all other embodiments obtained by persons of ordinary skill in the art without creative efforts fall within the protection scope of the present invention.

[0042] The terms "first", "second" and the like in the description and claims of the present invention and the above drawings are used to distinguish similar objects, and are not necessarily used to describe a specific sequence or sequence. It is to be understood that the data so used are interchangeable under appropriate circumstances such that t...

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to view more

PUM

No PUM Login to view more

Abstract

The invention provides a file merging method and device and a storage medium, and the method comprises the steps of obtaining an original file, a first modification file and a second modification file, the first modification file and the second modification file being files for a first user and a second user to perform the same or different data operations on the original file at the same time; determining a first data operation of a first user on the original file according to the original file and the first modification file, and determining a second data operation of a second user on the original file according to the original file and the second modification file; and according to a preset data operation merging strategy, merging the original file, the first modification file and the second modification file. By means of the method, the file merging conflict solving speed is increased, the automatic merging process is achieved, and the manual merging error rate is greatly reduced.

Description

technical field [0001] The embodiments of the present invention relate to the technical field of file management, and in particular, to a file merging method, device, and storage medium. Background technique [0002] The mainstream tool in the version management tool is SVN (Subversion), which is usually used to process the merger of file codes. However, this tool is not good at processing binary files. For example, an EXCEL file is a binary file in zip format. The files are merged normally. [0003] At present, in the process of game development, EXCEL files are often used. Game developers at different stages will submit a large number of EXCEL modification files, and file merge conflicts are always inevitable when submitting. Among them, file merge conflicts usually occur when different users modify the same version of the file at the same time. At this time, the files can only be merged and modified manually, which is time-consuming, labor-intensive, and error-prone. ...

Claims

the structure of the environmentally friendly knitted fabric provided by the present invention; figure 2 Flow chart of the yarn wrapping machine for environmentally friendly knitted fabrics and storage devices; image 3 Is the parameter map of the yarn covering machine
Login to view more

Application Information

Patent Timeline
no application Login to view more
IPC IPC(8): G06F17/22
CPCG06F40/197G06F40/194
Inventor 孙圣翔王佳
Owner NETEASE (HANGZHOU) NETWORK CO LTD
Who we serve
  • R&D Engineer
  • R&D Manager
  • IP Professional
Why Eureka
  • Industry Leading Data Capabilities
  • Powerful AI technology
  • Patent DNA Extraction
Social media
Try Eureka
PatSnap group products

Browse by: Latest US Patents, China's latest patents, Technical Efficacy Thesaurus, Application Domain, Technology Topic.

© 2024 PatSnap. All rights reserved.Legal|Privacy policy|Modern Slavery Act Transparency Statement|Sitemap