Skip to search formSkip to main contentSkip to account menu

Merge (version control)

Known as: Weave merge, 3-way merge, Three-way merge 
In version control, merging (also called integration) is a fundamental operation that reconciles multiple changes made to a version-controlled… 
Wikipedia (opens in a new tab)

Related topics

Related topics

14 relations
BitKeeperComparison of file comparison toolsConcurrent Versions SystemDarcs

Broader (2)

Configuration managementVersion control

Papers overview

Semantic Scholar uses AI to extract papers important to this topic.
2018
2018
Verifying Semantic Conflict-Freedom in Three-Way Program Merges
Even though many programmers rely on 3-way merge tools to integrate changes from different branches, such tools can introduce… 
2017
2017
Using hydrogen peroxide as a bladder irrigation solution for clot evacuation
Gross hematuria or macroscopic hematuria is a high risk urologic condition that might occur in different settings. In the case of… 
2017
2017
Institutional Control of Social Studies Teaching as Phronesis: A Multi-Case Study
This paper presents findings from a multi-case study of social studies educators which focused on the impact of institutional… 
Review
2016
Review
2016
Europe (EU28) vs. Norway - Assessment of Socio-economic Impact of In-vehicle Emergency Call (eCall)
In 2018, the emergency service eCall, based on the E112 initiative, will be implemented throughout the European Union (EU) and… 
Review
2015
Review
2015
Bottleneck Merge Control Strategies for Work Zones: Available Options and Current Practices
Maintenance and rehabilitation projects of interstate facilities typically mandate lane closures. Lane closures require merging… 
2015
2015
Towards AST-based Collaborative Editing
Handheld devices and cloud-connected applications are now commonplace. Even complex software development tasks are moving into… 
2012
2012
Efficient algorithms for comparing, storing, and sharing large collections of evolutionary trees
Evolutionary relationships between a group of organisms are commonly summarized in a phylogenetic (or evolutionary) tree. The… 
2010
2010
Using versioned tree data structure, change detection and node identity for three-way XML merging
XML has become the standard document representation for many popular tools in various domains. When multiple authors collaborate… 
2005
2005
A Fault-Tolerant Three-Way Merge for XML and HTML
Three-way merging is a technique that is used to reintegrate changes to a document when multiple independently modified copies… 
2003
2003
Towards Collaborative Content Management and Version Control for Structured Mathematical Knowledge
We propose an infrastructure for collaborative content management and version control for structured mathematical knowledge. This… 
By clicking accept or continuing to use the site, you agree to the terms outlined in our Privacy Policy (opens in a new tab), Terms of Service (opens in a new tab), and Dataset License (opens in a new tab)