# Obsidian File Diff

[![Obsidian Downloads](https://img.shields.io/badge/dynamic/json?color=7e6ad6&labelColor=34208c&label=Obsidian%20Downloads&query=$['file-diff'].downloads&url=https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/community-plugin-stats.json&)](obsidian://show-plugin?id=file-diff)
![GitHub stars](https://img.shields.io/github/stars/friebetill/obsidian-file-diff?style=flat)

## Commands

`Compare`: Compare your active file with another file and look at the differences.

`Compare and merge`: Same as `Compare`, but you have the option to merge changes.

`Find sync conflicts and merge`: Finds all Syncthing conflicts and shows the merge option for each conflict sequentially.

<img
src="https://user-images.githubusercontent.com/10923085/216749496-27f0b241-c05b-4aec-ba88-a7c8c91938a6.gif"
alt="GIF of a demo show this plugin" width="900" />

## Motivation

I created this plugin because I use [SyncThing](https://syncthing.net/) and it bothered me to clean up merge conflicts by hand.

## Installation

1. Search for "File Diff" in the community plugins of Obsidian
2. Install the plugin
3. Enable the plugin

## FAQ

1. How do I adjust the colors?

   Adjust the colors by following [these instructions](https://github.com/friebetill/obsidian-file-diff/issues/1#issuecomment-1425157959).

## Contributing

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

## Support

For support, please open an issue on the repository, with a reproducible example if possible.

If you're interested in supporting me, it would mean a lot if you could buy me a coffee through GitHub Sponsors, located on the right side.