@aburka Thanks for the feedback!
Definitely agreed on ours vs theirs, it's really confusing. Unfortunately I'm limited to how the sides are named in the file.
I like the diff3 conflictStyle in git, as it shows the base as well as both sides. I can't guarantee that the base is visible though, and it gives me three files to diff rather than two. Not sure about this case yet.
miniblog.
Related Posts
I've started using DNSControl for configuring DNS for my personal domains and it's been delightful. Declarative DNS!
I get comments (the DSL is just JS), history (it's in git) and trivial rollback! I've switched my DNS provider to Hetzner (which is free!) to use this.
I've now worked on several systems where the JSON was so big that avoiding pretty-printing was a performance win!
I eventually learned that there's a 'correct way up' for USB A cables. The two small holes should be on top.
Tragically not all power adapters get this right, even for name brands. My ability to get the cable right first time still isn't much better than 50%!