@article{lenguyen:hal-01917249, TITLE = {{An Analysis of Merge Conflicts and Resolutions in Git-based Open Source Projects}}, AUTHOR = {Le Nguyen, Hoai and Ignat, Claudia-Lavinia}, URL = {https://hal.science/hal-01917249}, JOURNAL = {{Computer Supported Cooperative Work}}, PUBLISHER = {{Springer Verlag}}, VOLUME = {27}, NUMBER = {3-6}, PAGES = {741-765}, YEAR = {2018}, MONTH = Jun, DOI = {10.1007/s10606-018-9323-3}, KEYWORDS = {Version control system ; parallel work ; Conflicts}, PDF = {https://hal.science/hal-01917249/file/ecscw2018.pdf}, HAL_ID = {hal-01917249}, HAL_VERSION = {v1}, }