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, C. Ignat, G. Oster, and P. Urso, 8émes journées francophones mobilité et ubiquité, In ACM, editor, ACM Symposium on Document Engineering, p.12, 2012.

S. Alshattnawi, G. Canals, and P. Molli, Concurrency awareness in a P2P wiki system, 2008 International Symposium on Collaborative Technologies and Systems, pp.285-294, 2008.
DOI : 10.1109/CTS.2008.4543942
URL : https://hal.archives-ouvertes.fr/inria-00337026

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. Choudhary and P. Dewan, A General Multi-User Undo/Redo Model, ECSCW'95: Proceedings of the fourth conference on European Conference on Computer-Supported Cooperative Work, pp.231-246, 1995.
DOI : 10.1007/978-94-011-0349-7_15

B. Collins-sussman, B. W. Fitzpatrick, and C. M. Pilato, Version Control with Subversion. O'Reilly Media, 2007.

B. Collins-sussman, M. Pilato, and B. Fitzpatrick, Version control with subversion, 2003.

D. M. Eggert and R. Stallman, Comparing and Merging Files with GNU diff and patch, Network Theory Ltd, 2003.

C. A. Ellis and S. J. Gibbs, Concurrency Control in Groupware Systems, SIGMOD Record : Proceedings of the ACM SIGMOD Conference on the Management of Data -SIGMOD '89, pp.399-407, 1989.

M. Fowler, Refactoring: Improving the Design of Existing Code, 1999.
DOI : 10.1007/3-540-45672-4_31

O. A. Hassan and L. Ramaswamy, Message replication in unstructured peer-to-peer network, 2007 International Conference on Collaborative Computing: Networking, Applications and Worksharing (CollaborateCom 2007), pp.337-344, 2007.
DOI : 10.1109/COLCOM.2007.4553853

C. Ignat, S. Papadopoulou, G. Oster, and M. C. Norrie, Providing awareness in multi-synchronous collaboration without compromising privacy, Proceedings of the ACM 2008 conference on Computer supported cooperative work, CSCW '08, pp.659-668, 2008.
DOI : 10.1145/1460563.1460665
URL : https://hal.archives-ouvertes.fr/inria-00343817

A. Imine, P. Molli, G. Oster, and M. Rusinowitch, Proving Correctness of Transformation Functions in Real-Time Groupware, Proceedings of the eighth conference on European Conference on Computer Supported Cooperative Work, ECSCW'03, pp.277-293, 2003.
DOI : 10.1007/978-94-010-0068-0_15
URL : https://hal.archives-ouvertes.fr/inria-00107652

D. Jackson and D. A. Ladd, Semantic Diff: a tool for summarizing the effects of modifications, Proceedings International Conference on Software Maintenance ICSM-94, pp.243-252, 1994.
DOI : 10.1109/ICSM.1994.336770

A. Kermarrec, A. I. Rowstron, M. Shapiro, and P. Druschel, The IceCube approach to the reconciliation of divergent replicas, Proceedings of the twentieth annual ACM symposium on Principles of distributed computing , PODC '01, pp.210-218, 2001.
DOI : 10.1145/383962.384020
URL : https://hal.archives-ouvertes.fr/hal-01248215

S. Khanna, K. Kunal, and B. C. Pierce, A Formal Investigation of Diff3
DOI : 10.1007/978-3-540-77050-3_40

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

T. Lindholm, A three-way merge for XML documents, Proceedings of the 2004 ACM symposium on Document engineering , DocEng '04, pp.1-10, 2004.
DOI : 10.1145/1030397.1030399

J. Maeda, The laws of simplicity, 2006.

S. Martin, M. Ahmed-nacer, and P. Urso, Controlled conflict resolution for replicated document, Proceedings of the 8th IEEE International Conference on Collaborative Computing: Networking, Applications and Worksharing, pp.471-480, 2012.
DOI : 10.4108/icst.collaboratecom.2012.250461
URL : https://hal.archives-ouvertes.fr/hal-00763410

S. Martin, P. Urso, and S. Weiss, Scalable XML Collaborative Editing with Undo, On the Move to Meaningful Internet Systems: OTM 2010, pp.507-514, 2010.
DOI : 10.1007/978-3-642-16934-2_37
URL : https://hal.archives-ouvertes.fr/inria-00508436

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

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

G. Oster, P. Urso, P. Molli, and A. Imine, Data consistency for P2P collaborative editing, Proceedings of the 2006 20th anniversary conference on Computer supported cooperative work , CSCW '06, pp.259-267, 2006.
DOI : 10.1145/1180875.1180916
URL : https://hal.archives-ouvertes.fr/inria-00108523

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

K. Petersen, M. J. Spreitzer, D. B. Terry, M. M. Theimer, and A. J. Demers, Flexible update propagation for weakly consistent replication, Proceedings of the sixteenth ACM symposium on Operating systems principles -SOSP'97, pp.288-301, 1997.

N. Preguiça, J. M. Marqù-es, M. Shapiro, and M. Letia, A Commutative Replicated Data Type for Cooperative Editing, 2009 29th IEEE International Conference on Distributed Computing Systems, pp.395-403, 2009.
DOI : 10.1109/ICDCS.2009.20

N. M. Preguiça, M. Shapiro, C. Matheson, and O. , Semantics-Based Reconciliation for Collaborative and Mobile Environments, CoopIS, DOA, and ODBASE -OTM Confederated International Conferences, pp.38-55, 2003.
DOI : 10.1007/978-3-540-39964-3_5

M. Ressel and R. Gunzenhäuser, Reducing the problems of group undo, Proceedings of the international ACM SIGGROUP conference on Supporting group work , GROUP '99, pp.131-139, 1999.
DOI : 10.1145/320297.320312

M. Ressel, D. Nitsche-ruhland, and R. Gunzenhäuser, An integrating, transformation-oriented approach to concurrency control and undo in group editors, Proceedings of the 1996 ACM conference on Computer supported cooperative work , CSCW '96, pp.288-297, 1996.
DOI : 10.1145/240080.240305

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

Y. Saito and M. Shapiro, Optimistic replication, ACM Computing Surveys, vol.37, issue.1, pp.42-81, 2005.
DOI : 10.1145/1057977.1057980
URL : https://hal.archives-ouvertes.fr/inria-00444768

M. Suleiman, M. Cart, and J. Ferrié, Serialization of concurrent operations in a distributed collaborative environment, Proceedings of the international ACM SIGGROUP conference on Supporting group work : the integration challenge the integration challenge, GROUP '97, pp.435-445, 1997.
DOI : 10.1145/266838.267369

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

N. Vidot, M. Cart, J. Ferrié, and M. Suleiman, Copies convergence in a distributed real-time collaborative environment, Proceedings of the 2000 ACM conference on Computer supported cooperative work , CSCW '00, pp.171-180, 2000.
DOI : 10.1145/358916.358988
URL : https://hal.archives-ouvertes.fr/hal-00684563

W. Vogels, Eventually consistent, Communications of the ACM, vol.52, issue.1, pp.40-44, 2009.
DOI : 10.1145/1435417.1435432

S. Weiss, P. Urso, and P. Molli, An Undo Framework for P2P Collaborative Editing, CollaborateCom, pp.529-544, 2008.
DOI : 10.1007/978-3-540-30468-5_12
URL : https://hal.archives-ouvertes.fr/inria-00432373

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