Unlock instant, AI-driven research and patent intelligence for your innovation.

File merging method and system based on git source code confliction

A source code and file technology, applied in the field of file merging method and system based on git source code conflicts, to achieve the effect of strong operability and conflict avoidance

Pending Publication Date: 2015-12-23
FUJIAN TQ DIGITAL
View PDF6 Cites 9 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

but still no merging of new lines appearing in the same position referred to in a file

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 system based on git source code confliction
  • File merging method and system based on git source code confliction
  • File merging method and system based on git source code confliction

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0021] In order to describe the technical content, achieved goals and effects of the present invention in detail, the following descriptions will be made in conjunction with the embodiments and accompanying drawings.

[0022] The most critical idea of ​​the present invention is: realize automatic merging by compiling and checking code.

[0023] Please refer to figure 1 , Embodiment 1 of the present invention provides a method for merging files based on git source code conflicts, comprising the following steps:

[0024] S1: Respectively acquire modification information on the first file to generate a second file and a third file;

[0025] S2: Merge the above three files to generate a conflict file;

[0026] S3: referring to the first file, detecting the new line in the conflict file, and deleting the merge mark;

[0027] S4: Compiling and checking the conflicting file to obtain a fourth file.

[0028] Different from the prior art, the present invention performs automatic me...

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 discloses a file merging method and system based on git source code confliction. The method comprises: S1: respectively obtaining modification information of a first file to generate a second file and a third file; S2: merging the three files to generate confliction files; S3: with reference to the first file, detecting new-added line of the confliction files, and deleting the merging tags; S4: compiling and inspecting the confliction files to obtain a fourth file. According to the method disclosed by the present invention, automatic merging of the modified files can be realized, confliction caused by new-added files in source code project configuration files is avoided, and strong operability is ensured.

Description

technical field [0001] The invention relates to the field of file editing, in particular to a file merging method and system based on git source code conflicts. Background technique [0002] At present, when multiple people modify the source code project file at the same time, different new files are often generated due to different modification methods, resulting in the addition of different content in the same line of the project file. This directly leads to the inability of the merge tool to automatically merge the modified new files. [0003] The existing patent (Application No.: 201210390805.2) discloses a network synchronization method and device. The method includes the steps of: monitoring the source file directory in the client computer, collecting change events in the source file directory; Obtain the initial change event sequence according to the time sequence of occurrence; merge the redundant events in the initial change event sequence according to preset rules...

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
Patent Type & Authority Applications(China)
IPC IPC(8): G06F17/30G06F9/45
CPCG06F8/43G06F16/16
Inventor 陈丛亮刘德建毛新生
Owner FUJIAN TQ DIGITAL