@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
The games console market is fascinating: there's incentive to *not* provide upgraded models.
You want the guarantee that a game for $X just works on any $X purchased.
E.g. the Switch OLED has a bigger screen, and a better CPU than the original, but it's downclocked to match the original Switch's CPU.
Tests may not guarantee correctness, but they are often suggestive.
When I have a bunch of regression tests for *real* issues, I feel a lot more confident. I'm covering ways I've failed in the past.
Here's a scary example from the tree-sitter-c bug tracker: before running the preprocessor, there's no guarantee that C code will parse!
(Typically it will I think, but no guarantees.)
