. Apache, Subversion, v.1.7. https://subversion.apache. org/, b. Accessed, pp.2014-2026

S. Balasubramaniam and B. C. Pierce, What is a file synchronizer?, Proceedings of the 4th annual ACM/IEEE international conference on Mobile computing and networking , MobiCom '98, pp.98-108, 1998.
DOI : 10.1145/288235.288261

. Basho, Conflict Resolution, pp.2015-2019

N. Bjørner, Models and software model checking of a distributed file replication system. Formal Methods and Hybrid Real-time Systems, pp.1-23, 2007.

E. A. Brewer, Towards robust distributed systems (abstract), Proceedings of the nineteenth annual ACM symposium on Principles of distributed computing , PODC '00, p.7, 2000.
DOI : 10.1145/343477.343502

G. Decandia, D. Hastorun, M. Jampani, G. Kakulapati, A. Lakshman et al., Dynamo: Amazon's Highly Available Key-value Store, Proceedings of Twenty-first ACM SIGOPS Symposium on Operating Systems Principles, SOSP '07, pp.205-220, 2007.

S. Gilbert and N. Lynch, Brewer's conjecture and the feasibility of consistent, available, partition-tolerant web services, ACM SIGACT News, vol.33, issue.2, pp.51-59, 2002.
DOI : 10.1145/564585.564601

. Git and . Git, http://git-scm.com/. Accessed, pp.2014-2026

R. Guy, P. Reiher, D. Rather, W. Gunter, G. Ma et al., Rumor: Mobile data access through optimistic peer-to-peer replication. Lecture notes in computer science, pp.254-265, 1999.

J. H. Howard, On overview of the andrew file system, Proceedings of the USENIX Winter Conference, pp.23-26, 1988.

L. Michael and . Kazar, Synchronization and caching issues in the andrew file system, Proceedings of the USENIX Winter Conference, pp.27-36, 1988.

A. Kermarrec, A. 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

J. James, M. Kistler, and . Satyanarayanan, Disconnected operation in the Coda file system, ACM Trans. Comput. Syst, vol.10, issue.1, pp.3-25, 1992.

. Oracle, Oracle Database Advanced Replication, 12c Release 1 (12.1) http://docs.oracle.com/database, pp.2015-2019

D. Stott, P. Jr, G. J. Popek, G. Rudisin, A. Stoughton et al., Detection of mutual inconsistency in distributed systems, IEEE Transactions on Software Engineering, issue.3, pp.240-247, 1983.

G. Popek and B. J. Walker, The LOCUS distributed system architecture, 1985.

R. A. Pottinger and P. A. Bernstein, Merging Models Based on Given Correspondences, Proceedings of the 29th international conference on Very large data bases, VLDB '03, pp.862-873, 2003.
DOI : 10.1016/B978-012722442-8/50081-1

N. Preguiça, J. M. Marques, 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. Ramsey and . Csirmaz, An algebraic approach to file synchronization, ACM SIGSOFT Software Engineering Notes, vol.26, issue.5, pp.175-185, 2001.
DOI : 10.1145/503271.503233

D. Ratner, P. Reiher, J. Gerald, and . Popek, Roam: a scalable replication system for mobile computing, Proceedings. Tenth International Workshop on Database and Expert Systems Applications. DEXA 99, pp.96-104, 1999.
DOI : 10.1109/DEXA.1999.795151

D. Ratner, P. Reiher, J. Gerald, and . Popek, Roam: A Scalable Replication System for Mobility, Mobile Networks and Applications, vol.9, issue.5, pp.537-544, 2004.
DOI : 10.1023/B:MONE.0000034707.26695.e8

L. Peter, . Reiher, S. John, D. Heidemann, G. Ratner et al., Resolving file conflicts in the Ficus file system, 1994.

M. Satyanarayanan, J. J. Kistler, P. Kumar, M. E. Okasaki, E. H. Siegel et al., Coda: a highly available file system for a distributed workstation environment, IEEE Transactions on Computers, vol.39, issue.4, pp.447-459, 1990.
DOI : 10.1109/12.54838

M. Segura, V. Rancurel, V. Tao, and M. Shapiro, Scality's experience with a geo-distributed file system, Proceedings of the Posters & Demos Session on, Middleware Posters and Demos '14, pp.31-32, 2014.
DOI : 10.1145/2678508.2678524

M. Shapiro, N. Preguiça, C. Baquero, and M. Zawirski, Conflict-Free Replicated Data Types, Stabilization, Safety, and Security of Distributed Systems, pp.386-400, 2011.
DOI : 10.1007/978-3-642-24550-3_29

URL : https://hal.archives-ouvertes.fr/inria-00609399

M. Shapiro, N. Preguiça, C. Baquero, and M. Zawirski, A comprehensive study of convergent and commutative replicated data types, 2011.
URL : https://hal.archives-ouvertes.fr/inria-00555588

D. B. Terry, M. M. Theimer, K. Petersen, A. J. Demers, M. J. Spreitzer et al., Managing update conflicts in bayou, a weakly connected replicated storage system, Proceedings of the Fifteenth ACM Symposium on Operating Systems Principles, SOSP '95, pp.172-182, 1995.

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

B. Walker, G. Popek, R. English, C. Kline, and G. Thiel, The LOCUS distributed operating system, ACM SIGOPS Operating Systems Review, vol.17, issue.5, pp.49-70, 1983.
DOI : 10.1145/773379.806615

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