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

A method and device for generating a merge conflict record list

A technology for recording lists and directories, applied in the field of generating merge conflict record lists, which can solve problems such as loss of modified content, inability to provide historical merge conflict records, and difficult merge conflicts for verifiers

Active Publication Date: 2018-04-10
ALIBABA GRP HLDG LTD
View PDF3 Cites 0 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

The consequence of this defect is that the modified content is often lost without the developer's knowledge
[0009] In addition, in the existing technology, it is also impossible to manage the historical merge conflict records well
For example, historical merge conflict records cannot be viewed, and it is difficult for validators to check whether all merge conflicts have been resolved

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
  • A method and device for generating a merge conflict record list
  • A method and device for generating a merge conflict record list
  • A method and device for generating a merge conflict record list

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0027] The main idea of ​​this application is to obtain a complete list of merge conflict records from the merge process, and check the conflict resolution of the specified merge operation, so as to solve the problem in the prior art that it is difficult to prompt a complete list of merge conflict records , while solving the problem of viewing and sorting historical merge conflict records. This application is especially suitable for parallel development mode.

[0028] In a typical configuration, a computing device includes one or more processors (CPUs), input / output interfaces, network interfaces, and memory.

[0029] Memory may include non-permanent storage in computer-readable media, in the form of random access memory (RAM) and / or nonvolatile memory, such as read-only memory (ROM) or flash memory (flashRAM). Memory is an example of computer readable media.

[0030] Computer-readable media, including both permanent and non-permanent, removable and non-removable media, can ...

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 present application provides a method and device for generating a merge conflict record list. The method includes the steps of: obtaining a list of objects deleted or overwritten in a specified merge operation; checking whether the contents of the objects in the list are different in the source branch and the target branch; when there is a difference in the contents of the objects in the source branch and the target branch , generating a merge conflict record corresponding to the object; and adding the merge conflict record to a list of merge conflict records. According to the present application, it is possible to identify the list of files with differences and conflicts in all contents during the merging process, so as to avoid loss of modified contents without the developer's knowledge.

Description

technical field [0001] The present application relates to the field of computer data processing, in particular to a method and device for generating a merge conflict record list. Background technique [0002] In the software life cycle, the demand for software changes is inevitable, and the process of software development and maintenance is also the process of effectively changing the software. In the case of parallel development, it is likely that concurrent changes to the same configuration item will be required. By separately recording these development processes for the same configuration item, different branches (variants) of the configuration item are formed. [0003] Branching is a feature that allows a collection of files to diverge into two or more forked paths. Branching is often used when a team must maintain two or more similar base codes (as might happen, for example, when a product is released and work on the next version must begin). Specifically, the so-ca...

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 Patents(China)
IPC IPC(8): G06F8/71
Inventor 李素石
Owner ALIBABA GRP HLDG LTD