Skip to content

Commit

Permalink
Merge pull request #5038 from Sliosh/patch-1
Browse files Browse the repository at this point in the history
Fix small detail about conflicts in overview.rst
  • Loading branch information
rnewson committed Apr 25, 2024
2 parents 5cb8529 + e847c86 commit ab07e51
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/docs/src/intro/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,9 @@ CouchDB allows for any number of conflicting documents to exist
simultaneously in the database, with each database instance deterministically
deciding which document is the "winner" and which are conflicts. Only the
winning document can appear in views, while "losing" conflicts are still
accessible and remain in the database until deleted or purged during
database compaction. Because conflict documents are still regular documents,
they replicate just like regular documents and are subject to the same
security and validation rules.
accessible and remain in the database until deleted. Because conflict
documents are still regular documents, they replicate just like regular
documents and are subject to the same security and validation rules.

When distributed edit conflicts occur, every database replica sees the same
winning revision and each has the opportunity to resolve the conflict.
Expand Down

0 comments on commit ab07e51

Please sign in to comment.