miniblog.

I'm increasingly doubtful that commit messages should be entirely immutable. I sometimes find myself editing or commenting on merged pull requests, to help future readers. Phabricator appended a URL to commit messages, which helped. In principle PR merging could do the same thing.

Interesting people keep popping up on the difftastic issue tracker. Here's a discussion of applying structural diff techniques to language-aware merging:

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.