M. Ahmed-nacer, C. Ignat, G. Oster, H. Roh, and P. Urso, Evaluating CRDTs for real-time document editing, Proceedings of the 11th ACM symposium on Document engineering, DocEng '11, 2011.
DOI : 10.1145/2034691.2034717
URL : https://hal.archives-ouvertes.fr/inria-00629503

M. Ahmed-nacer, P. Urso, V. Balegas, and N. Preguica, Concurrency Control and Awareness Support for Multi-synchronous Collaborative Editing, Proceedings of the 9th IEEE International Conference on Collaborative Computing: Networking, Applications and Worksharing, pp.148-157, 2013.
DOI : 10.4108/icst.collaboratecom.2013.254113
URL : https://hal.archives-ouvertes.fr/hal-00873496

J. Antin, C. Cheshire, and O. Nov, Technology-mediated contributions, Proceedings of the ACM 2012 conference on Computer Supported Cooperative Work, CSCW '12, pp.373-382
DOI : 10.1145/2145204.2145264

C. Bird, P. Rigby, E. Barr, D. Hamilton, D. German et al., The promises and perils of mining git, 2009 6th IEEE International Working Conference on Mining Software Repositories, pp.1-10, 2009.
DOI : 10.1109/MSR.2009.5069475

Y. Brun, R. Holmes, M. D. Ernst, and D. Notkin, Speculative analysis, Proceedings of the FSE/SDP workshop on Future of software engineering research, FoSER '10, pp.59-64, 2010.
DOI : 10.1145/1882362.1882375

Y. Brun, R. Holmes, M. D. Ernst, and D. Notkin, Proactive detection of collaboration conflicts, Proceedings of the 19th ACM SIGSOFT symposium and the 13th European conference on Foundations of software engineering, SIGSOFT/FSE '11, pp.168-178, 2011.
DOI : 10.1145/2025113.2025139

M. Cart and J. Ferrie, Asynchronous reconciliation based on operational transformation for P2P collaborative environments, 2007 International Conference on Collaborative Computing: Networking, Applications and Worksharing (CollaborateCom 2007), pp.127-138, 2007.
DOI : 10.1109/COLCOM.2007.4553821
URL : https://hal.archives-ouvertes.fr/lirmm-00189691

R. De-souza-santos and L. Murta, Evaluating the branch merging effort in version control systems, Software Engineering (SBES), 2012 26th Brazilian Symposium on, pp.151-160, 2012.

P. Dewan and R. Hegde, Semi-synchronous conflict detection and resolution in asynchronous software development, ECSCW, pp.159-178, 2007.
DOI : 10.1007/978-1-84800-031-5_9

P. Dourish and V. Bellotti, Awareness and coordination in shared workspaces, Proceedings of the 1992 ACM conference on Computer-supported cooperative work , CSCW '92, pp.107-114, 1992.
DOI : 10.1145/143457.143468

C. A. Ellis and S. J. Gibbs, Concurrency control in groupware systems, SIGMOD Conference, pp.399-407

K. Fogel and M. Bar, Open source development with CVS. Coriolis Group Books, 2001.

F. S. Gnu and . Diff3, Three way file comparison program, 2005.

M. L. Guimarães and A. R. Silva, Improving early detection of software merge conflicts, 2012 34th International Conference on Software Engineering (ICSE), pp.342-352, 2012.
DOI : 10.1109/ICSE.2012.6227180

C. Gutwin, R. Penner, and K. Schneider, Group awareness in distributed software development, Proceedings of the 2004 ACM conference on Computer supported cooperative work , CSCW '04, pp.72-81, 2004.
DOI : 10.1145/1031607.1031621

B. K. Kasi and A. Sarma, Cassandra: Proactive conflict minimization through optimized task scheduling, 2013 35th International Conference on Software Engineering (ICSE), pp.732-741, 2013.
DOI : 10.1109/ICSE.2013.6606619

D. B. Leblang, The cm challenge: Configuration management that works, Configuration management, pp.1-37, 1995.

F. Mattern, Virtual time and global states of distributed systems, Proceedings of the International Workshop on Parallel and Distributed Algorithms, pp.215-226, 1989.

T. Mens, A state-of-the-art survey on software merging. Software Engineering, IEEE Transactions on, vol.28, issue.5, pp.449-462, 2002.

P. Molli, G. Oster, H. Skaf-molli, and A. Imine, Using the transformational approach to build a safe and generic data synchronizer, Proceedings of the 2003 international ACM SIGGROUP conference on Supporting group work , GROUP '03, pp.212-220, 2003.
DOI : 10.1145/958160.958194
URL : https://hal.archives-ouvertes.fr/inria-00099815

E. W. Myers, AnO(ND) difference algorithm and its variations, Algorithmica, vol.21, issue.1, pp.251-266, 1986.
DOI : 10.1007/BF01840446

G. Oster, P. Urso, P. Molli, and A. Imine, Tombstone Transformation Functions for Ensuring Consistency in Collaborative Editing Systems, 2006 International Conference on Collaborative Computing: Networking, Applications and Worksharing, 2006.
DOI : 10.1109/COLCOM.2006.361867
URL : https://hal.archives-ouvertes.fr/inria-00109039

D. E. Perry, H. P. Siy, and L. G. Votta, Parallel changes in large-scale software development: an observational case study, ACM Transactions on Software Engineering and Methodology, vol.10, issue.3, pp.308-337, 2001.
DOI : 10.1145/383876.383878

J. G. Prudencio, L. Murta, C. Werner, and R. Cepeda, To lock, or not to lock: That is the question, Journal of Systems and Software, vol.85, issue.2, pp.277-289, 2012.
DOI : 10.1016/j.jss.2011.04.065

T. Roche and L. Whipple, Essential SourceSafe. Hentzenwerke Series, 2001.

H. Roh, M. Jeon, J. Kim, and J. Lee, Replicated abstract data types: Building blocks for collaborative applications, Journal of Parallel and Distributed Computing, vol.71, issue.3, pp.354-368, 2011.
DOI : 10.1016/j.jpdc.2010.12.006

A. Sarma, D. Redmiles, and A. Van-der-hoek, Palantir: Early detection of development conflicts arising from parallel code changes. Software Engineering, IEEE Transactions on, vol.38, issue.4, pp.889-908, 2012.

C. Sun, Undo as concurrent inverse in group editors, ACM Transactions on Computer-Human Interaction, vol.9, issue.4, pp.309-361, 2002.
DOI : 10.1145/586081.586085

C. Sun and C. A. Ellis, Operational transformation in real-time group editors, Proceedings of the 1998 ACM conference on Computer supported cooperative work , CSCW '98, pp.59-68, 1998.
DOI : 10.1145/289444.289469

W. F. Tichy, Rcs ??? a system for version control, Software: Practice and Experience, vol.2, issue.7, pp.637-654, 1985.
DOI : 10.1002/spe.4380150703

N. Vidot, M. Cart, J. Ferrié, and M. Suleiman, Copies convergence in a distributed real-time collaborative environment. CSCW '00, pp.171-180, 2000.
URL : https://hal.archives-ouvertes.fr/hal-00684563

S. Weiss, P. Urso, and P. Molli, Logoot: A Scalable Optimistic Replication Algorithm for Collaborative Editing on P2P Networks, 2009 29th IEEE International Conference on Distributed Computing Systems, pp.404-412, 2009.
DOI : 10.1109/ICDCS.2009.75
URL : https://hal.archives-ouvertes.fr/inria-00432368

S. Weiss, P. Urso, and P. Molli, Logoot-Undo: Distributed Collaborative Editing System on P2P Networks, IEEE Transactions on Parallel and Distributed Systems, vol.21, issue.8, pp.1162-1174, 2010.
DOI : 10.1109/TPDS.2009.173
URL : https://hal.archives-ouvertes.fr/hal-00450416