https://github.com/friebetill/obsidian-file-diff

View the difference between two files within Obsidian.
https://github.com/friebetill/obsidian-file-diff

difference-viewer file-differences obsidian-md obsidian-plugin

Last synced: 2 months ago
JSON representation

View the difference between two files within Obsidian.

• Host: GitHub
• URL: https://github.com/friebetill/obsidian-file-diff
• Owner: friebetill
• License: mit
• Created: 2023-01-26T05:13:37.000Z (almost 2 years ago)
• Default Branch: master
• Last Pushed: 2024-02-15T06:39:43.000Z (12 months ago)
• Last Synced: 2024-08-08T00:44:44.088Z (6 months ago)
• Topics: difference-viewer, file-differences, obsidian-md, obsidian-plugin
• Language: TypeScript
• Homepage:
• Size: 176 KB
• Stars: 81
• Watchers: 2
• Forks: 1
• Open Issues: 7
• Metadata Files:
  • Readme: README.md
  • Funding: .github/FUNDING.yml
  • License: LICENSE

Awesome Lists containing this project

• project-awesome - friebetill/obsidian-file-diff - View the difference between two files within Obsidian. (TypeScript)

README

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



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