Related posts
Adam Tornhill
x.com
When it comes to merge conflicts, GenAI truly delivered on the 10x promise.
genai conflicts merge
The the words it uses that this site has seen
least often elsewhere. Posts are matched on those words alone —
nothing here is a summary of this one.
Sources
All Writing x.com Mastodon Korrents Blog Bluesky Site GitHub
Top people
Tim Bray
Julia Evans
Kent C. Dodds
danah boyd
Ray Dalio
Anne Applebaum
Brad Templeton
Tuomas Artman
Saloni Dattani
Xe Iaso
Emil Kowalski
Karri Saarinen
Showing Profile →
Show everything
Hiding Show them again
Show them again
Further back ↓
Hiding Show them again
19 September
Software engineer and educator; creator of Testing Library and of the EpicWeb.dev and EpicReact.dev courses.
In Kody, you can have skills, but even better is documented utilities. It's basically a skill + a tool. Resulting in a much more reliable and repeatable outcome. Here's the code that lives in Kody and it's what agents get when they search for "merge a pull request" Related
16 September
Founded Bridgewater Associates in 1975 and led it until stepping back from control in 2022. Author of Principles, The Changing World Order and How Countries Go Broke; publishes economic analysis at economicprinciples.org.
As I’ve explained here before, at this stage in my life, my main goal is to pass along the principles and templates I've learned with the hope that they can help others as much as they've helped me. One thing that has been incredibly valuable to me is learning that just because something hasn’t happened before in my lifetime doesn’t mean it won’t happen. So I needed to look not only at what the markets have been doing lately but to also study big events—like debt crises, internal political conflicts, and international wars—throughout history. For example, it was by studying the Great Depressi… wmi.edu.sg
Related
Writes jvns.ca, turning "hard and scary" topics — networking, debugging, Linux internals — into plain explanations and hand-drawn comics. Publishes Wizard Zines, illustrated programming zines. Software developer based in Montreal.
in Lisbon for Git Merge / JJ Con this week Related
15 September
American-Polish journalist and historian, staff writer at The Atlantic; author of Gulag, Iron Curtain, Twilight of Democracy and Autocracy, Inc.
12 September
Canadian software developer and writer, co-editor of the XML and Atom specifications and formerly of Sun Microsystems, Google and AWS. Has written the blog ongoing since 2003.
In the course of the last week, did you use software which was substantially LLM-generated to accomplish something useful to you or your employer? In particular, something that was NOT software-development-related? #GenAI #LLM LLMs Related
11 September
Canadian software developer and writer, co-editor of the XML and Atom specifications and formerly of Sun Microsystems, Google and AWS. Has written the blog ongoing since 2003.
”Astra for Coding: Why Are We Doing This Again?” by Armin Ronacher: https://lucumr.pocoo.org/2026/9/7/astra-why/ Fascinating reportage from the frontier-model coalface; especially since Armin has been in some respects a #genai true believer. Related
10 September
Software architect and futurist; founded ClariNet, chaired the EFF, and has written about robocars for two decades.
8 September
Co-founder and CTO of Linear; previously an engineer at Uber.
What if the Linear agent were to review every single code change and automatically merge those that are deemed relatively safe to land and don't introduce any regressions. Would that be of interest? Related
7 September
Canadian software developer and writer, co-editor of the XML and Atom specifications and formerly of Sun Microsystems, Google and AWS. Has written the blog ongoing since 2003.
Huh, I was at Apple.com and glanced at the Mac Studio page - https://www.apple.com/mac-studio/ - I notice they're explicitly pitching it for LLM on the desktop. I wonder how realistic that is… Hmm, let’s ask @simon, he’s closer to this stuff than most of us. I’m pretty convinced that irrespective of all the issues, the economics of #genAI just don’t work with the current compute infrastructure requirements. Open models and what’s left of Moore’s law could be a really big deal. #apple LLMs Related
I updated my blog’s Colophon: https://www.tbray.org/ongoing/misc/Colophon from which I quote: “The words here are not AI-generated”. #genAI Related
Writes jvns.ca, turning "hard and scary" topics — networking, debugging, Linux internals — into plain explanations and hand-drawn comics. Publishes Wizard Zines, illustrated programming zines. Software developer based in Montreal.
if you're dealing with a merge conflict in Git like this, how do you figure out which side the of the conflict comes from which branch? (you can pick more than one) FRUITS = [ "apple", >>>>>> add-fruit "orange", ] Related
3 September
Researcher and science writer. Co-founder and editor at Works in Progress magazine, formerly a researcher at Our World in Data, and author of the Scientific Discovery newsletter on science, global health and medical innovation.
That's crazy. ... Must be because of the -loni in her name. I have no conflicts of interest to report. Related
1 September
Technical educator, conference speaker and developer relations engineer based in Ottawa, Canada. Author of the Anubis bot filter and of over 400 articles at xeiaso.net.
31 August
Writes jvns.ca, turning "hard and scary" topics — networking, debugging, Linux internals — into plain explanations and hand-drawn comics. Publishes Wizard Zines, illustrated programming zines. Software developer based in Montreal.
I'm working on phase 2 of Project Improve Git's documentation and I need beta readers! Here's a signup form: https://forms.gle/swn1jhCULndnCxG87 The first topic is going to the docs on merge conflicts. I'd love signups from anyone who uses Git on the command line and who would be interested in reading the current version of some man pages and leaving feedback about what's confusing. Especially if you're not 100% comfortable with Git! documentation Related
25 August
Design engineer; formerly at Linear and Vercel; author of Sonner and Vaul; teaches animations.dev.
Linear Diffs has been a joy to use, but one detail I like about the merge queue specifically is that the little icon on the left animates subtly. It made me smile the first time I saw it. Nice work, @yangit. Quoting @linear New: Merge queue status in diffs See where a PR is in the queue and when it’s expected to merge. Related
Co-founder and CEO of Linear; previously principal designer at Airbnb, where he led the Design Language System, and founding designer at Coinbase.
Merge status now available on @linear Diffs Quoting @linear New: Merge queue status in diffs See where a PR is in the queue and when it’s expected to merge. Related
12 August
Co-founder of WordPress and founder of Automattic; blogs at ma.tt.
Co-founder and CTO of Honeycomb; previously an infrastructure engineer at Parse, Facebook and Linden Lab, and co-author of Observability Engineering.
Their words
As soon as you merge, it should be going out. You like you should have to stop the train to make your code not go into production as soon as you've merged.
Show the whole quote
youtube.com
10 August
Founded PSPDFKit in 2011 and ran it for a decade. Came back from a break to work on AI agents — the OpenClaw project, and OpenAI, joined in February 2026. Writes at steipete.me.
Software engineer at PlanetScale and creator of the vim-go plugin. Writes at arslan.io about Go, tooling, industrial design and books.
Their words
Anyone using GitHub knows that it isn't cut out for agents. The workflow, the review process, the merge queue and many things are made for the previous era.
Show the whole quote
Joining Cursor arslan.io
5 August
Economist at George Mason University. Writes Overcoming Bias on prediction markets, signalling and the far future, and wrote The Age of Em and The Elephant in the Brain.
23 July
Writer on happiness, habits and human nature. Author of The Happiness Project, Better Than Before and The Four Tendencies, and host of the Happier with Gretchen Rubin podcast.
21 July
JavaScript programmer; creator of the jQuery library, author of Secrets of the JavaScript Ninja, and long-time engineer at Khan Academy.
The new Github Stacked PRs preview is incredible. Landing 5 stacked PRs directly to a merge queue all at once! A+++! This removes so much friction (and the gh cli tools + agent skill help a ton) Related
19 July
Chief Product and Technology Officer at Netflix, previously VP of Science at Lyft and an economist at Analysis Group.
Their words
I think anytime a new technology comes along, especially one that's as transformative as GenAI, you go through a storming phase before you go through the forming phase of things. And I think we are in the middle of that right now.
Show the whole quote
youtube.com
1 July
Freelance climate and energy analyst in Oslo, writing on Europe, the US and Australia; worked in the Australian renewables industry before that.
Google
Their words
What is happening is that GenAI's climate harm comes from the system design, such as Google's AI overview triggering constantly whether users want it or not, in addition to significantly worse digital bloat tools dominating overconsumption.
Show the whole quote
ketanjoshi.co
16 June
Researcher of social media, privacy and youth culture; founder of Data & Society and author of It’s Complicated.
I have a new book coming out this fall and now I’m getting SLAMMED with GenAI invitations to join their book community (for a fee of course). I doubt I’m alone. But what I can’t work out is how the economy of these pay-to-play networks is working. Has anyone investigated? Curious minds want to know. Related
2 June
Swedish programmer with degrees in engineering and psychology, author of Your Code as a Crime Scene and founder of CodeScene.
1 March
Researcher of social media, privacy and youth culture; founder of Data & Society and author of It’s Complicated.
Current household debate: Who bullshits more - GenAI or politicians? Related
29 January
Free software developer; maintainer of sway, wlroots, aerc and scdoc, and founder of the SourceHut (sr.ht) software forge.
The cults of TDD and GenAI I’ve gotten a lot of flack throughout my career over my disdain towards test-driven development (TDD). I have met a lot of people who swear by it! And, I have also met a lot of people who insisted that I adopt it, too,…
Related
25 November 2025
Co-founder and chief scientist of Safe Superintelligence Inc., and previously co-founder and chief scientist of OpenAI.
Their words
And the solution is if people become part AI with some kind of neural link++ because what will happen as a result is that now the AI understands something and we understand it too like because now the understanding is transmitted wholesale.
Show the whole quote
youtube.com
5 May 2025
Astrophysicist at Barnard College; wrote Black Hole Blues and How the Universe Got Its Spots, and directs sciences at Pioneer Works.
Their words
We don’t think that the universe has had enough time to make them from stars that just merge. We know that two black holes can merge and make a bigger black hole and then those can merge and make a bigger black hole. We don’t think there’s been enough time for that.
Show the whole quote
youtube.com
23 February 2025
Programmer and teacher; writes on software, learning and the web, and makes the Coding Blocks video course.
8 October 2024
Swedish software developer writing about tooling, working from home and running a software business at seastone.io.
16 May 2024
Software engineer and educator; creator of Testing Library and of the EpicWeb.dev and EpicReact.dev courses.
9 November 2023
Founded SpaceX in 2002, joined Tesla's board in 2004 and became its chief executive in 2008; later founded Neuralink, The Boring Company and xAI. Bought Twitter in 2022 and renamed it X, where he now posts many times a day.
Their words
So generally, I think we obviously want to prioritize civilizational risks over things that are painful and tragic on a local level, but not civilizational.
Show the whole quote
youtube.com
7 July 2023
Product management teacher and consultant; wrote Escaping the Build Trap and teaches product at Harvard Business School.
15 September 2022
Co-founder and partner at Union Square Ventures in New York. Has written the AVC blog almost every day since 2003, on venture capital, startups, music and crypto.
I just awoke to the news that The Merge was completed successfully a few hours ago. Congratulations and thanks to everyone in the ETH community for making this happen. Here's why this is so important avc.mirror.xyz
Related
Nothing matches. Show everything
A korrent is a belief a person has stated in their own words: one
sentence stating the claim, backed by a quote and a source, kept at
korrents.com .
Under a name here, the quoted block is what they actually said.
The korrent beneath it is the claim those words support, in
korrents' wording — tap it to see the record, its source, and who
else holds it.
Nobody here wrote their own korrents. They are compiled from public
statements, and a person can change their mind, which is recorded too.
Got it
About the English under a post
Some people here publish in a language other than English. Where they
do, this site shows a machine translation beneath the post, in
this typeface — the site's own, not theirs.
The post itself is never changed, moved or hidden: what is set in the
serif above is exactly what the person published, and it is what to
quote them on. A translation can be wrong in ways that matter,
especially about tone.
Only the post's own words are translated. A quoted post, a linked
article and a belief on korrents.com
are left in their original language.
Got it