Conversation
Redocly previews |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR updates the API documentation for Inter-Sync Gateway Replication (ISGR) to reflect changes in Sync Gateway 4.x, specifically updating the default conflict resolution policy and adding guidance for document merges.
Key changes:
- Updates default conflict resolution policy documentation to distinguish between pre-4.x and 4.x+ behavior
- Adds note about excluding
_revand_cvproperties when performing document merges in custom conflict resolvers
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
torcolvin
reviewed
Sep 22, 2025
Collaborator
torcolvin
left a comment
There was a problem hiding this comment.
Do we ever explain in the public documentation what _rev and _cv are in the custom conflict resolver section? I can see that we don't because it's hard to know how you would use them, but are they visible to users who might want to do something like custom merge if there is a flag, or LWW otherwise?
What happens if you include _rev or _cv? Does ISGR reject this document?
torcolvin
approved these changes
Sep 23, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CBG-4849
Pre-review checklist
fmt.Print,log.Print, ...)base.UD(docID),base.MD(dbName))docs/apiDependencies (if applicable)
Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGatewayIntegration/0000/