You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@opendal.apache.org by xu...@apache.org on 2026/10/26 19:22:23 UTC

(opendal-yinyang) 01/01: merge: track the stable conflict identity checkpoint

This is an automated email from the ASF dual-hosted git repository.

Xuanwo pushed a commit to branch xuanwo/managed-sync-acceptance
in repository https://gitbox.apache.org/repos/asf/opendal-yinyang.git

commit d946ba8744d9562da97ef735325d861fe17006e5
Merge: 0438f11 6d30ecf
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Tue Oct 27 03:22:02 2026 +0800

    merge: track the stable conflict identity checkpoint
    
    Co-authored-by: Chojan Shang <ps...@apache.org>

 src/replica/directory.rs | 272 +++++++++++++++++++++++++++++++++++++----------
 src/replica/linux.rs     |  26 +++++
 src/replica/state.rs     |  48 +++++++++
 src/sync_cli.rs          |  83 +++++++++++----
 4 files changed, 355 insertions(+), 74 deletions(-)