Merge conflict processing method and device and conflicting file processing method and device

A conflict processing and file processing technology, applied in the computer field, can solve problems such as low merging efficiency, and achieve the effect of improving merging efficiency

Inactive Publication Date: 2016-04-06
ALIBABA GRP HLDG LTD
View PDF4 Cites 8 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

[0006] The embodiment of the present invention proposes a method and device for merging conflicts and conflicting files, which solves the problem of low merging efficiency caused by conflict defects in multi-branch merging scenarios
[0009] When it is determined to resolve the merge conflict, handle the conflict according to the conflict file package

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
  • Merge conflict processing method and device and conflicting file processing method and device
  • Merge conflict processing method and device and conflicting file processing method and device
  • Merge conflict processing method and device and conflicting file processing method and device

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0030] In order to make the technical solutions and advantages of the present invention clearer, the exemplary embodiments of the present invention will be further described in detail below in conjunction with the accompanying drawings. Obviously, the described embodiments are only part of the embodiments of the present invention, not all implementations. Exhaustive list of examples. And in the case of no conflict, the embodiments and the features in the embodiments of the present invention can be combined with each other.

[0031] The inventor noticed during the invention that:

[0032] In the parallel development mode, when there are multiple branches, if the branches are merged, conflicts may occur. When developers resolve conflicts, they need to compare the two branch files for processing. Developers need to understand the relationship between conflicting files and use conflicting tools to deal with them. During the resolution process, conflicting files may be missed, and...

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 invention provides a merge conflict processing method and device and a conflicting file processing method and device. The conflicting file processing method comprises: when a client side has a conflict in each branch merging, a server side records a conflicting file with the conflict in each branch merging, and as long as the client side extracts out the conflicting file, next branch merging can be continued; and when the merge conflict is determined to be solved, conflict processing can be carried out according to a conflicting file package. According to the technical scheme provided by embodiments of the present invention, when a client has the conflict in each branch merging, the conflict can be temporarily not solved, and the next branch merging can be performed after clicking a submit button. The next branch merging does not depend on solution of the conflict of previous branch merging, and branch merging can be continuously processed.

Description

technical field [0001] The invention relates to the field of computer technology, in particular to a method and device for processing merge conflicts and conflict files. Background technique [0002] In software development, multiple release versions need to be maintained, or multiple platform variants need to be supported. The solution to these requirements creates the concept of branches. A branch is a copy of the development mainline for parallel development. In existing software development tools, developers can develop and write codes for the branch they are responsible for in their respective clients. After completing the development of the branch they are responsible for, they can communicate with The development mainline of the server machine was merged. In parallel development mode, when multiple branches are merged, conflicts may arise. [0003] One solution in the prior art solution is: the developer resolves the conflict on the target branch and submits it to m...

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/30
Inventor 沈东佳
Owner ALIBABA GRP HLDG 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