Skip to content

Navigation Menu

Appearance settings

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

couchbase / sync_gateway Public

Notifications You must be signed in to change notification settings
Fork 140
Star 449

Code
Issues
Pull requests 6
Actions
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Wiki
Security
Insights

CBG-4806: move conflict detection to common function#7683

Merged

gregns1 merged 5 commits intomaincouchbase/sync_gateway:mainfrom

CBG-4806couchbase/sync_gateway:CBG-4806Copy head branch name to clipboard

Aug 18, 2025

Conversation Commits5 (5)Checks Files changed

Merged

CBG-4806: move conflict detection to common function#7683
gregns1 merged 5 commits intomainfrom
CBG-4806

Commits

Commits on Aug 15, 2025

CBG-4806: move conflict detection to common function to be shared between areas
gregns1
committed
add test for IsInConflict function
gregns1
committed
lint issue
gregns1
committed
updates based off review
gregns1
committed
update comments to remove reference to CBL and SG peers
gregns1
committed

Footer

© 2025 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.