Researchers are currently drawn to study projects hosted on GitHub due to its popularity,
ease of obtaining data, and its distinctive built-in social features. GitHub has been found to …

When multiple developers change a software system in parallel, these concurrent changes
need to be merged to all appear in the software being developed. Numerous merge …

While unstructured merge tools rely only on textual analysis to detect and resolve conflicts,
semistructured merge tools go further by partially exploiting the syntactic structure and …

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 modern software development, developers rely on version control systems like Git to
collaborate in the branch-based development workflow. One downside of this workflow is …

The Boolean satisfiability problem (SAT) is a famous NP-complete problem in computer
science. An effective way for solving a satisfiable SAT problem is the stochastic local search …

Merge conflicts occur when software practitioners need to work in parallel and are inevitable
in software development. Tool builders and researchers have focused on the prevention and …

Background: Merge conflicts are a common occurrence in software development.
Researchers have shown the negative impact of conflicts on the resulting code quality and …

Empirical studies show that merge conflicts frequently occur, impairing developers'
productivity, since merging conflicting contributions might be a demanding and tedious task …

Merge conflicts are known to cause extra effort for developers, but little is known about their
effect on software. While some research has been done, many questions remain. To better …