Looking for breakthrough ideas for innovation challenges? Try Patsnap Eureka!

Code conflict elimination method and device and storage medium

A code and memory technology, applied in the field of devices and storage media, code conflict elimination methods, can solve problems such as costing a lot and affecting the efficiency of software product development

Pending Publication Date: 2022-04-22
AGRICULTURAL BANK OF CHINA
View PDF0 Cites 0 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

[0003] However, in the development process of existing software products, it is necessary to manually spend a lot of time judging the code conflicts in different versions of the code files, and the code conflicts are eliminated based on the judgment results, which affects the development efficiency of software products.

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
  • Code conflict elimination method and device and storage medium
  • Code conflict elimination method and device and storage medium
  • Code conflict elimination method and device and storage medium

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0059] The method, device and storage medium for eliminating code conflicts provided by the embodiments of the present application will be described in detail below with reference to the accompanying drawings.

[0060] The term "and / or" in this article is just an association relationship describing associated objects, which means that there can be three relationships, for example, A and / or B can mean: A exists alone, A and B exist simultaneously, and there exists alone B these three situations.

[0061] The terms "first" and "second" in the specification and drawings of the present application are used to distinguish different objects, or to distinguish different processes for the same object, rather than to describe a specific sequence of objects.

[0062] In addition, the terms "including" and "having" mentioned in the description of the present application and any variations thereof are intended to cover non-exclusive inclusion. For example, a process, method, system, prod...

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 code conflict elimination method and device and a storage medium, and relates to the technical field of computers, the probability that code snippets deviate from reserved snippets can be determined through code editing data of developers, and therefore code conflicts can be eliminated on the basis of the probability that the code snippets deviate from the reserved snippets. The code snippets with conflicts do not need to be compared manually, the efficiency of eliminating the code conflicts can be greatly improved, and therefore the development efficiency of software products can be improved. The method comprises the steps that under the condition that it is determined that at least two code snippets have code conflicts, at least one kind of code editing data of developers corresponding to the code snippets is obtained; determining code maturity of the code snippets based on the at least one type of code editing data; the code maturity is used for representing the probability that the code snippets deviate from the reserved snippets; and based on the code maturity, code conflicts are eliminated.

Description

technical field [0001] The embodiments of the present application relate to the field of computer technology, and in particular to a method, device and storage medium for eliminating code conflicts. Background technique [0002] The development process of a software product generally requires the collaboration of multiple developers. In the process of multi-person collaboration, code version management tools (eg, version control tools such as Git or subversion) are generally used to manage different versions of code. During the development of software products, when code conflicts occur between code files of different versions, the code conflicts need to be eliminated. [0003] However, in the existing software product development process, it is necessary to manually spend a lot of time judging the code conflicts in different versions of the code files, and the code conflicts are eliminated based on the judgment results, which affects the development efficiency of the softwa...

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): G06F8/77
CPCG06F8/77
Inventor 刘阳杨杰荣侯晓靓李辉
Owner AGRICULTURAL BANK OF CHINA
Who we serve
  • R&D Engineer
  • R&D Manager
  • IP Professional
Why Patsnap Eureka
  • Industry Leading Data Capabilities
  • Powerful AI technology
  • Patent DNA Extraction
Social media
Patsnap Eureka Blog
Learn More
PatSnap group products

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

© 2024 PatSnap. All rights reserved.Legal|Privacy policy|Modern Slavery Act Transparency Statement|Sitemap|About US| Contact US: help@patsnap.com