Top all-time · #20419
nilbus.com
Personal blog · blog.nilbus.comprogramming
nilbus.com is a personal blog at blog.nilbus.com about programming. Since 2017, 3 different Hacker News readers have linked it 3 times, most often “Take the pain out of Git conflict resolution: use diff3 (2017)”. The last post was in 2022, but the archive is still widely read.
Too few sampled comments (1) to say how often HN recommends it.?
Why HN links it
The only comment cites the blog for git merge conflict style, recommending diff3 or zdiff3 over the default. HN readers link it for git conflict-resolution tips.
Summarised by Claude from a sample of 1 HN comments that link here. Each comment is marked recommending, critical or neutral (citing without judging); how this works.
Rubyist and git lover
Most-linked posts?
- Take the pain out of Git conflict resolution: use diff3 (2017)3 people · 3 mentions · first linked 2017-09-24
What Hacker News says?
On a related note, I seriously recommend everyone to set their merge.conflictStyle to diff3 (or even zdiff3 on newer Gits). It shows you all of your version, thier version, and the original, common-ancestor version. It really should be the default, and, as far as I know, the only reason it isn't is because there are some older diff(1) implementation that don't support three-way diffs. See https://blog.nilbus.com/tak…
Comment linking /take-the-pain-out-of-git-conflict-resolution-use-diff3/
on “Highlights from Git 2.36”Submitted Take the pain out of Git conflict resolution: use diff3 (2017) as a story · 191 points
HN discussionSubmitted Take the pain out of Git conflict resolution: use diff3 as a story · 2 points
HN discussion