The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies

Draft of 40-page journal extension paper submitted to EMSE Journal. Empirical Software Engineering (EMSE) invited journal extension of ICSME'17 paper "Software Practitioner Perspectives on Merge Conflicts and Resolutions." Currently under submission.

Name		Name	Last commit message	Last commit date
R_data		R_data
imgs		imgs
.gitignore		.gitignore
Abstract.tex		Abstract.tex
Acknowledgements.tex		Acknowledgements.tex
Bibliography.bib		Bibliography.bib
Conclusions.tex		Conclusions.tex
Implications.tex		Implications.tex
Introduction.tex		Introduction.tex
Methodology.tex		Methodology.tex
README.md		README.md
RQ1.tex		RQ1.tex
RQ2.tex		RQ2.tex
RQ3.tex		RQ3.tex
RQ4.tex		RQ4.tex
RQ5.tex		RQ5.tex
Related_Work.tex		Related_Work.tex
Results.tex		Results.tex
Threats.tex		Threats.tex
Titlepage.tex		Titlepage.tex
main.tex		main.tex
misc.tex		misc.tex
spbasic.bst		spbasic.bst
spmpsci.bst		spmpsci.bst
spphys.bst		spphys.bst
svglov3.clo		svglov3.clo
svjour3.cls		svjour3.cls

Navigation Menu

Repository files navigation

The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies

About

Releases

Packages

Contributors

Languages

Latest commit

History

Folders and files

Repository files navigation

The Life-Cycle of Merge Conflicts: Processes, Barriers, and Strategies

About

Topics

Resources

Stars

Watchers

Forks

Releases

Packages

Contributors

Languages