1. Kinetic Merge - it's a CLI tool for merging in Git repositories. What it gives over and above the core Git merge is the ability to merge through the motion of code from one location to another. Yes, Git can track file-renames and merge through them, but it doesn't follow code moving around inside a file, or a file being split into two or more pieces, or a new file accumulating code that used to live in several files. Essentially, the sort of thing you get with a lot of refactorings or automated code tidy-ups.

I've been at this since 2023; it was a long-standing itch I had to scratch since back in the early 2010s, finally got some time to work on it. Now in its 57th release, GitHub tells me!

It's written in Scala and packaged up as a standalone executable - needs a JVM >= 17 to run it on Linux / Windows / OSX.

(https://github.com/sageserpent-open/kineticMerge)

2. Americium - this is a mixed Java / Scala framework for folk who want to write property-based or generally parameterised tests, but: a) want the failing tests to shrink automatically without writing custom shrinkage logic and b) don't want to have the test structure and expectations DSL dictated to them by the framework.

Its job is to serve up test data into your flavour of Java or Scala test, look for an exception from the test and get shrinking. The rest is up to you.

There is a separately shipped artifact that plugs into JUnit5 / JUnit6 for a tighter integration, including test replay via IntelliJ or Visual Studio or whatnot, but that's an optional extra.

I've worked on this since 2020, now hitting its 52nd release. I use it for my other projects, and I know of a couple of corporate teams that use it because I evangelised it to them, but ironically, I'm only just getting round to using it for the problem that motivated me to write it in the first place.

(https://github.com/sageserpent-open/americium)