Software Practitioner Perspectives on Merge Conflicts and Resolutions

10-page technical paper submitted to ICSME 2017. Presented at the International Conference on Software Maintenance and Evolution (ICMSE) in Shanghai, China from September 17-24, 2017. Received IEEE TCSE Distinguished Paper Award.

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
IEEEtran.bst		IEEEtran.bst
IEEEtran.cls		IEEEtran.cls
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
Related_Work.tex		Related_Work.tex
Results.tex		Results.tex
Threats.tex		Threats.tex
main.tex		main.tex
misc.tex		misc.tex

Navigation Menu

Repository files navigation

Software Practitioner Perspectives on Merge Conflicts and Resolutions

About

Releases

Packages

Contributors

Languages

Latest commit

History

Folders and files

Repository files navigation

Software Practitioner Perspectives on Merge Conflicts and Resolutions

About

Topics

Resources

Stars

Watchers

Forks

Releases

Packages

Contributors

Languages