obsidian-plugin/friebetill_obsidian-file-diff
1
0
Fork 0
mirror of https://github.com/friebetill/obsidian-file-diff.git synced 2026-07-22 07:40:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
No description
111 commits 1 branch 17 tags 273 KiB
TypeScript 79.9%
Shell 11.7%
JavaScript 4.3%
CSS 4.1%
Find a file
Justice Vellacott 185f95f30a I fixed the colors using the css mix function it'll now work on any theme.
2025-08-03 22:23:57 -04:00
.github Create FUNDING.yml 2023-02-04 12:43:41 +08:00
scripts Add release script 2023-01-26 13:50:43 +08:00
src fix bug where files have same name but differing paths 2024-02-08 10:25:22 -05:00
.editorconfig Initial commit 2023-01-26 13:13:41 +08:00
.eslintignore Follow guide https://bit.ly/3JIZGTE to improve Prettier + ESLint 2023-02-02 22:36:11 +08:00
.eslintrc Add 'Find sync conflicts and merge' command 2023-03-27 00:05:36 +08:00
.gitignore Initial commit 2023-01-26 13:13:41 +08:00
.npmrc Initial commit 2023-01-26 13:13:41 +08:00
.prettierignore Follow guide https://bit.ly/3JIZGTE to improve Prettier + ESLint 2023-02-02 22:36:11 +08:00
.prettierrc.json Add semicolons to prevent difficult to debug bugs 2023-02-22 12:14:02 +08:00
esbuild.config.mjs Move main file to src subfolder 2023-01-26 13:50:32 +08:00
LICENSE Add license 2023-01-26 13:49:53 +08:00
manifest.json Release version 1.1.1 2024-02-15 13:39:30 +07:00
package.json Release version 1.1.1 2024-02-15 13:39:30 +07:00
README.md Add SyncThing link 2023-11-08 12:52:26 +01:00
styles.css I fixed the colors using the css mix function it'll now work on any theme. 2025-08-03 22:23:57 -04:00
tsconfig.json Disable analysis of node_modules folder 2023-02-01 17:58:12 +08:00
version-bump.mjs Initial commit 2023-01-26 13:13:41 +08:00
versions.json Release version 1.1.1 2024-02-15 13:39:30 +07:00
yarn.lock Update locked packages 2023-11-08 02:39:03 +01:00

README.md

Obsidian File Diff

Obsidian Downloads GitHub stars

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.

GIF of a demo show this plugin

Motivation

I created this plugin because I use SyncThing 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.

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.