Obsidian plugins with #conflict-resolution#

The Self-hosted LiveSync plugin syncs vault data through CouchDB, S3 compatible object storage or WebRTC peer to peer mode, with end to end encryption and conflict handling for note changes, metadata and hidden files. It can merge simple text conflicts automatically, sync settings, snippets, themes and community plugins through Customisation Sync or Hidden File Sync, and generate a setup URI so additional devices can join an existing vault from a working one. The plugin shows synchronisation status, transfer counts and storage activity in the status bar, includes recovery and troubleshooting paths for damaged states and supports an optional managed CouchDB host. Peer to peer mode still needs a signalling relay and one device with the required data online during synchronisation.

The EasySync plugin syncs a vault across Windows, macOS, Linux, iOS and Android through OneDrive. It previews the sync plan before changes are applied, then handles notes, attachments and other vault files with content hashes instead of relying only on modified time. It can sync renames, moves and deletions, join new devices to an existing vault state and resume interrupted uploads or downloads after a restart or network break. Text changes that do not overlap can be merged automatically, while other text conflicts and binary file changes are shown for manual review. The plugin can also sync editor settings, appearance, themes, snippets, shortcuts, bookmarks, core plugins, community plugins and selected plugin data, with status, history and diagnostics shown in a dedicated sidebar.

The GitHub Gitless Sync plugin enables seamless synchronization between your Obsidian vault and a GitHub repository without requiring Git to be installed. Designed with cross-platform compatibility in mind, it supports both desktop and mobile environments using GitHub's REST API. The plugin provides manual and automatic sync options, supports multiple vaults, and includes a conflict resolution interface that helps manage file discrepancies between devices.