Obsidian 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.

Installation

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

FAQ

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 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.