Conflict Manager

A simple plugin for conflict resolution. No more hunting through your file system. Just open your file, hit Review, and Resolve.

Features

• Alert Banner: A top banner alerts you that your current file contains unresolved sync conflicts.
• Diff Viewer: Review differences between the original file and conflict files using an intuitive split-pane layout.
• Status Bar Indicator: Quickly view the status of conflicts in the vault.
• Conflict Hub: A side panel listing every file in the vault that still has conflict copies, opened from the ribbon icon.
• Config Conflict Resolution: Resolves conflicting copies of your Obsidian settings, plugin data, themes and CSS snippets in one click. See the FAQ.

Installation

1. Open Settings > Community plugins in Obsidian.
2. Find Conflict Manager.
3. Select Install, then Enable.

Setup

Everything in this plugin relies on the conflict file pattern. Open Settings > Conflict Manager and enter the word your sync service puts into the name of a conflict copy (default: conflict). It is literal text, not a regular expression. Without a pattern nothing is detected.

Commands

Commands are available from the command palette (Ctrl/Cmd + P) and can be bound to a hotkey in Settings > Hotkeys.

Command	What it does	Requires
Conflict manager: Open conflict hub	Opens the Conflict Hub panel with all unresolved conflicts in the vault. Same as the ribbon icon.	Conflict file pattern
Conflict manager: Review conflicts of the active file	Opens the diff viewer for the active file. If the file has no conflict copies, a notice is shown instead.	Conflict file pattern, an open file
Conflict manager: Merge conflicts in config files	Merges conflict copies of settings files after you confirm.	"Config conflicts" turned on

FAQ

How do I merge conflict copies of config files?

Sync services like Dropbox, Google Drive or Syncthing can also create conflict copies of Obsidian's own settings in the .obsidian folder. The plugin can merge them for you.

Turn it on: Settings > Conflict Manager > Config conflicts. Then run the Merge conflicts in config files command or click the merge button in the Conflict Hub. The number on the button shows how many settings files have conflicts.

Checked files:

• .obsidian/*.json (except workspace.json and workspace-mobile.json)
• .obsidian/plugins/*/data.json
• .obsidian/themes/*/manifest.json and theme.css
• .obsidian/snippets/*.css

How files are merged (the same way Obsidian Sync does it):

• Settings files: settings from all versions are combined. If a setting is different, the newest version wins.
• Themes, CSS snippets and lists like community-plugins.json: the newest version is kept.
• Broken files are skipped.

Nothing changes until you confirm: you see the list of files and choose which ones to merge. Old versions go to trash. The previous original is named <name>.old there. After merging, reload Obsidian so plugins pick up the new settings.

[!WARNING] Settings files can contain private data like tokens. If the system trash is not available, old versions go to the vault's .trash folder, which your sync service or Git may upload. You don't need this with Obsidian Sync: it never creates conflict copies of settings.

When copying and pasting multiple lines in Obsidian, an extra line break is inserted.

Go to Settings > Editor > Convert pasted HTML to Markdown and toggle it off.

Releasing

1. Update the version in manifest.json, package.json, package-lock.json and versions.json.
2. Commit the change:

   git commit -m "chore: prepare version <current_version>"
   git push origin main
   

3. Create and push the tag:

   git tag -a <current_version> -m "<current_version>"
   git push origin <current_version>
   

4. Wait for the release workflow to finish.
5. Open the main page of the repository and select Releases in the right sidebar.
6. Select Edit (pencil icon) next to the draft release.
7. Add release notes, then select Publish.

Contributing

If you have any issues/suggestions, please open an issue on the repository. If you'd like to contribute to the code, please fork the repository and submit a pull request.