@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
Ooh, today I learnt that terminals support italics! Difftastic now uses italics for comments.
Bold/italics are great because they're still visible even when you're showing text in green or red. They compose nicely :)
I'm surprised I've never seen a lisp dialect where it's idiomatic to use trailing parens as you would in C.
(foreach car cars
(drive car)
)
It makes structure very visible when you're trying to add a new expression.
IDEs help, but is the ))) density always compelling?
One thing that bothers me about today's diffs: we often read changes in a format that patch can consume!
Diffs are largely read by humans, but we have to mentally parse "@@ -40,7 +40,9 @@". Which line is line 40? Is it the first visible line, or the first changed line?
