How do developers resolve merge conflicts? an investigation into the processes, tools, and improvements

Abstract

Most software development is done in teams. When more than one developer is modifying the source code, there is a change that their changes will conflict. When this happens, developers have to interrupt their workflow in order to resolve the merge conflict. This interruption can lead to frustration and lost productivity. This makes collaboration, and the problems associated with it, an important aspect of software development. Merge conflicts are some of the more difficult issues that arise when working in a team.

BibTeX

@inproceedings{Brindescu:FSE18,
  author    = {Caius Brindescu},
  title     = {How do developers resolve merge conflicts? an investigation into the processes, tools, and improvements},
  booktitle = {{ESEC/SIGSOFT} {FSE}},
  pages     = {952--955},
  publisher = {{ACM}},
  year      = {2018},
}

How do developers resolve merge conflicts? an investigation into the processes, tools, and improvements

Abstract

Related papers