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
As a kid I didn't particularly like bosses in games: they were a bother that you couldn't skip. Now, I see so many bosses with *amazing* designs.
I think I'm just less intimidated. Platformers also let you wait until you're ready more often too.
Cleaned up an old git repo of Ansible playbooks and it's amazing how much is just Docker now.
Docker handles process supervision, centralises logging, and containers coexist without issues. It's nice when things get simpler.
Amazing blog post about running a modern Linux kernel on Chumby hardware, investigating bad CPU numbers from top, and finding a Linux kernel bug from 2009!