Top all-time · #18967
Esoteric Rubbish
Personal blog · eseth.orgprogrammingsystems
Esoteric Rubbish is a personal blog at eseth.org about programming and systems. Since 2022, 4 different Hacker News readers have linked it 5 times, most often “Mergetools: Stop doing three-way merges”. The last post was in 2023, but the archive is still widely read.
Too few sampled comments (2) to say how often HN recommends it.?
Why HN links it
HN readers link this blog for a deep, comprehensive write-up on resolving Git merge conflicts with diff3 and mergetools, including the mergetool.hideResolved setting.
Summarised by Claude from a sample of 2 HN comments that link here. Each comment is marked recommending, critical or neutral (citing without judging); how this works.
Esoteric Rubbish
Most-linked posts?
- Mergetools: Stop doing three-way merges3 people · 4 mentions · first linked 2022-04-21
What Hacker News says?
There's a (relatively) new feature in Git that makes the conflicts even better. This write-up is deep and super comprehensive: https://www.eseth.org/2020/mergetools.html `git config mergetool.hideResolved true` enables the modern git mergetool behavior.
Comment linking /2020/mergetools.html
on “Take the pain out of Git conflict resolution: use diff3 (2017)”Submitted Mergetools: Stop doing three-way merges as a story · 2 points
HN discussionIn case the name doesn't jump out at you, this is Bram Cohen, inventory of Bittorrent. And Chia proof-of-storage (probably better descriptions available) cryptocurrency. https://en.wikipedia.org/wiki/Bram_Cohen It's not the same as capturing it, but I would also note that there are a wide wide variety of ways to get 3-way merges / 3 way diffs from git too. One semi-recent submission (2022 discussing a 2017) discusse…
Comment linking /2020/mergetools.html
on “A Coherent Vision for the Future of Version Control”Submitted Generate PDF Invoices from the CLI with groff (2020) as a story · 2 points
HN discussionSubmitted Mergetools: Stop doing three-way merges (2020) as a story · 1 points
HN discussion