@InProceedings{ENFM-ICGSE14, author = {H.-Christian Estler and Martin Nordio and Carlo A. Furia and Bertrand Meyer}, title = {Awareness and Merge Conflicts in Distributed Software Development}, booktitle = {Proceedings of the 9th International Conference on Global Software Engineering (ICGSE)}, editor = {Yuanfang Cai and Jude Fernandez and Wenyun Zhao}, pages = {26--35}, year = {2014}, month = {August}, publisher = {IEEE Computer Society}, note = {Best paper award}, urltopdf = {/people/furia/pubs/icgse14.pdf} }