This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit c570deff373d7f9b1c14db34e981312b09ff71aa Merge: 28ee29984 0879fe59d Author: Robert Newson <[email protected]> AuthorDate: Thu Mar 12 13:19:52 2026 +0000 Merge pull request #5371 from apache/reduce-intra-cluster-conflicts Reduce intra cluster conflicts rel/overlay/etc/default.ini | 4 + src/fabric/src/fabric_doc_update.erl | 195 ++++++++++++++++++++++++++++++----- 2 files changed, 175 insertions(+), 24 deletions(-)
