Embed Notice

@ShadSterling @b0rk
Huh, I’d never even considered using that for investigating my own local merge conflicts! I guess it could be useful.

I find that the thing Git’s out-of-the-box behavior does especially poorly is explaining to me what •other• developers did. It’s hard enough to be mindful of not losing / garbling my own work in the merge, but at least I (theoretically) know what I did!