@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 asked Hermes Agent to change how it set thread titles, and it patched its own source code!
Self modifying code is hard to reason about even in a deterministic environment. I'd already limited Hermes access to the todoist API and web search out of an abundance of caution.
31
Delighted to see that TOML has released a new version! TOML is overall a great standard but I understand they had limited people with the power to cut a new release.
Are there examples of IDE services deliberately leveraging elaborate type systems?
I'm struggling to think of what a richer type system enables in the IDE space. The existence of void* in C, interface{} in Go, or a lack of generics, doesn't seem to have limited possibilities.