keepass-diff VS diffsitter

The sync conflicts happened to me whenever I left keepass databases open and changed it on multiple devices. Usually, those changes were adding new accounts into the databases or changing a password on one while adding something on the other. This regularly happened when working in a team.

I assumed people would switch from Keepass + database synced on a private server to something else when they started working in teams and need better/easier permission models. :)

As you have mentioned it, I have written the tool keepass-diff (<https://github.com/Narigo/keepass-diff/>) to help me for exactly these conflicts and I could quickly resolve the issues with it. It was still useful enough to let me keep using Keepass. Was it not working for you or was it too hard to use because of how it needs to be set up first? Would you have stayed with Keepass + sync if something similar to this was integrated into UI clients?

I had this problem as well, these conflicts may happen when you keep Keepass clients open and add passwords on two different machines.

I have written a CLI tool in Rust called keepass-diff that may help you with this: https://github.com/Narigo/keepass-diff

Or https://github.com/afnanenayet/diffsitter. I've tried both and I like them. No preference or notable opinions on them yet!

For git diff's I've been using https://github.com/afnanenayet/diffsitter

One more tree-sitter based diffing tool - diffsitter

https://github.com/afnanenayet/diffsitter

Several threads here point to difftastic: https://github.com/Wilfred/difftastic

I know a lot of people who have a lot of hope for diffsitter (or something like it): https://github.com/afnanenayet/diffsitter

Personally, I think the reason most "good" semantic diff tools are proprietary is that they are huge amounts of effort that are mostly "hacks" and "heuristics" bandaged together in ways that people don't want to let out how the sausage was made.

But I also "general, language agnostic AST-based semantic diff" is a mountain peak we cannot reach (probably ever), and I believe my experiments found an interesting local maxima that people are maybe sleeping on (lexer-based diffs rather than parser-based diffs): https://github.com/WorldMaker/tokdiff

https://github.com/afnanenayet/diffsitter there are quiet a few projects such as this one, attempting to solve the issue. :)

There’s an interesting project in the semantic diff/merge space that I have been keeping an eye out for https://github.com/afnanenayet/diffsitter

I have never used any of them, but it look like tree-sitter based diff tools are exactly what you are searching for (like difftastic, gumtree or diffsitter).

I believe Unison is the only attempt to do this at a programming language/environment level.

For Git diffs, there is Diffsitter, which uses Tree Sitter to generate semantic diffs of code files: https://github.com/afnanenayet/diffsitter

I have not used it, but it is high on my todo list.

Looks great, I'll try it! FYI, there is a very similar project called diffsitter https://github.com/afnanenayet/diffsitter