Developers regularly have to resolve merge conflicts, ie, two conflicting sets of changes to
the same files in different branches, which can be tedious and error-prone. To resolve …

Developers create software branches for tentative feature addition and bug fixing, and
periodically merge branches to release software with new features or repairing patches …

During collaborative software development, developers often use branches to add features
or fix bugs. When merging changes from two branches, conflicts may occur if the changes …

Forking structure is widespread in the open-source repositories and that causes a significant
number of merge conflicts. In this paper, we study the problem of textual merge conflicts from …

Background. During collaborative software development, developers often use branches to
add features or fix bugs. When merging changes from two branches, conflicts may occur if …

In collaborative software development, developers simultaneously work in parallel on
different branches that they merge periodically. When edits from different branches textually …

Context: in software engineering, developers working concurrently on a project frequently
need to merge changes in the source code. The manual resolution of merge conflicts is a …

In collaborative software development, program merging is the mechanism to integrate
changes from multiple programmers. Merge algorithms in modern version control systems …

Collaborative development is critical to improve the productivity. Multiple contributors work
simultaneously on the same project and might make changes to the same code locations …

Merge conflicts are inevitable in collaborative software development and are disruptive.
When they occur, developers have to stop their current work, understand the conflict and the …