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

Code integration acceleration method and system

A technology to speed up systems and codes, applied in version control, software maintenance/management, etc., can solve problems such as dependence on developers, conflict-prone feature branch integration, cumbersomeness, etc., and achieve the effect of reducing cumbersomeness and inefficiency

Active Publication Date: 2019-10-25
SHANGHAI CTRIP COMMERCE CO LTD
View PDF8 Cites 0 Cited by
  • Summary
  • Abstract
  • Description
  • Claims
  • Application Information

AI Technical Summary

Problems solved by technology

[0005] The technical problem to be solved by the present invention is to overcome the defects in the prior art that in the software development process, the feature branches of each function in the early stage of development are prone to conflicts in the later integration of independent development, and the feature branch integration relies on manual integration by developers, and the workload is heavy and cumbersome. , providing a code integration acceleration method and system

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 integration acceleration method and system
  • Code integration acceleration method and system

Examples

Experimental program
Comparison scheme
Effect test

Embodiment Construction

[0032] The present invention is further illustrated below by means of examples, but the present invention is not limited to the scope of the examples.

[0033] refer to figure 1 and figure 2 , in one embodiment, the code integration acceleration method includes:

[0034] Step 101: configure the LM service, pull the LM branch from the HEAD of the integration branch, and integrate each feature branch into the LM branch one by one;

[0035] Step 102: Determine whether there is a conflict in the integration process, if so, go to step 103; if not, go to step 104;

[0036] Step 103: stop the integration, and report the conflict information;

[0037] Step 104: Integrate each feature branch into the LM branch;

[0038] Step 105: Integrate the LM branch obtained in step 104 into the integrated branch.

[0039] The corresponding code integration acceleration system includes a configuration module 11, a judgment module 13, an integration module 12 and an output module 14, wherein, ...

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 integration acceleration method and a code integration acceleration system. The method comprises the following steps: S1, configuring an LM service, pulling an LM branchfrom an HEAD of an integrated branch, and enabling all characteristic branches to be integrated to the LM branch one by one; S2, judging whether conflicts exist in the integration process or not, andif yes, entering the step S3; if not, entering the step S4; S3, integration is stopped, and conflict information is reported; S4, integrating each characteristic branch into an LM branch; and S5, integrating the LM branch obtained in the step S4 into an integrated branch. The integration activity of each function only needs to configure the LM service on the code platform. A project team does notneed to build a respective code integration environment, does not need to manually execute a code integration command, and does not need to manually trigger compiling, packaging and deploying. The complexity and the low efficiency of branch integration are reduced to a great extent.

Description

technical field [0001] The invention relates to a code integration acceleration method and system. Background technique [0002] In the software project development process, the project usually has multiple functions developed together. In the early stage of development, in order to reduce mutual interference, a feature branch is created for each function. Due to the strong independence between the various branches in the early stage of development, affected by uncontrollable factors in R&D, for a certain point in the future, there will be a problem of whether multiple features and functions can be integrated. And after each feature branch enters the stable stage, it must be integrated together, and then compiled, packaged and tested together. [0003] In the actual development process, it is inevitable that multiple feature branches will encounter the situation of modifying common files. If each developer does not pay attention to the changes of public files in time, it ma...

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/71
CPCG06F8/71Y02D10/00
Inventor 苏玲王潇俊李海涛
Owner SHANGHAI CTRIP COMMERCE CO LTD
Features
  • R&D
  • Intellectual Property
  • Life Sciences
  • Materials
  • Tech Scout
Why Patsnap Eureka
  • Unparalleled Data Quality
  • Higher Quality Content
  • 60% Fewer Hallucinations
Social media
Patsnap Eureka Blog
Learn More

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

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