It's amazing that merging work at all.
It's a dumb textual transform that provides no guarantees that the code is even syntactically valid, let alone correct. The problem feels AI-complete.
I've seen bad resolutions of merge conflicts way more than bad automatic merges though.
miniblog.
Related Posts
I'm surprised that there are no ML tools for automatic log highlighting. Logs often have repetitive patterns that lend themselves to distinct colours.
Do any such tools exist?
Porting my 2016 Rust project from getopts to clap, and it's amazing how far the ecosystem has come.
clap gives me a nicer help, automatic value validation, and can even generate completions for shells!
First screenshot is getopts, second is clap.
I tend to shy away from automatic, implicit behaviour in software. I've seen CMake setups where FindFoo.cmake is automatically picked up for configuring the Foo library.
What are examples of tools with a larger amount of automagic behaviour that you like?