Avoid Git Merge Conflicts During a Big Rebase

Follow a connection

Related by topics and source metadata.

1. 1

   Debugging native Node.js addons with Electron on macOS

   article

   Felix RiesebergFelix RiesebergAugust 18, 2023

   In this post, I'll explain advanced techniques to debug native code in Electron apps (specifically, native Node.js addons) using lldb and Xcode. You might be interested in this post if you have an Electron app, use native Node.js addons (like sqlite3 , nodegit , or java ), and recently

   Original source ↗Software engineering
2. 2

   Adventures in Measuring JavaScript

   article

   Felix RiesebergFelix RiesebergNovember 9, 2023

   This is a post about my attempts to measure the CPU cost of JavaScript in a large codebase using thread instruction counters within Chrome's tracing tools.

   Original source ↗Software engineering
3. 3

   Using WebGL Shadertoy Shaders in Three.js

   article

   Felix RiesebergFelix RiesebergSeptember 21, 2024

   Tutorial: Using Shadertoy shaders in three.js - with example code using Next.js, Three.js, and React.

   Original source ↗Software engineering
4. 4

   Things people get wrong about Electron

   article

   Felix RiesebergFelix RiesebergJanuary 21, 2025

   From $25,000 Bloomberg Terminals to SpaceX spaceship controls, web tech is powering systems you'd never expect. Many desktop apps are built with Electron. Why build with web tech — and why bundle parts of Chromium to do so?

   Original source ↗Software engineering
5. 5

   The Fanciest eCards

   article

   Felix RiesebergFelix RiesebergFebruary 28, 2025

   Replace your dystopian e-cards with little over-engineered custom websites — and it'll make you a better engineering manager. I promise.

   Original source ↗Consciousness & philosophySoftware engineeringUnexpected finds
6. 6

   Made by mechanical means

   article

   Felix RiesebergFelix RiesebergSeptember 27, 2026

   How I'm using Claude in fall 2026: Blender, CGI, and music composition, without running code on my computer or opening a single Claude Code thread myself.

   Original source ↗Frontier AISoftware engineering
7. 7

   How to be more ambitious: A tutorial for humans with models

   article

   Felix RiesebergFelix RiesebergOctober 13, 2026

   I work on Claude. It's an interesting experience: Every day I learn about yet another feat accomplished with or by Claude that I hadn't considered, didn't think possible, or simply lacked the curiosity and time to try. This month, it may have helped discover

   Original source ↗Science & psychologySoftware engineeringUnexpected finds
8. 8

   battledrones v14: Compass Rose, a four player map

   article

   Simon WillisonOctober 24, 2026

   Release: battledrones v14: Compass Rose, a four player map I added four player online mode to Battledrones - previous maps were limited to two. Here's the initial prompt I used: Add a new map for a four player battle - four way rotational symmetry, up to four AI players, works with the WebSocket non-audio based multiplayer mode so up to four human players can join (any spare slots use AI) Claude Opus 5.5 added a new map called "Compass Rose" and modified the WebSockets multiplayer network code to support up to four players for that map, joining via share links or QR codes. The new teams use ro

   Original source ↗Software engineering
9. 9

   AI code development

   article

   EarLevel EngineeringNigel RedmonOctober 22, 2026

   I’m far from early to the party, but I wanted to drop a note on using AI to develop code, and in particular managing the dirty work of audio plugins. Hint: Game changer. A couple of nights ago, I paid … Continue reading →

   Original source ↗Music discoverySoftware engineering
10. 10

    Introducing Kimi K3.1 Pro

    article

    Simon WillisonOctober 23, 2026

    Introducing Kimi K3.1 Pro Kimi K3.1 Pro landed on the Kimi API today - it's not yet open weights, but Moonshot promise "Full model weights will be released by Nov 4, 2026". They're also offering a "Highspeed" version that's 2-3x faster, at twice the price (except for input token cache hits, which are priced the same). The US dollar pricing is $2.00/million tokens for input and $10/million for output - the same as GPT-6.1 Sol and half the price of Claude Opus 5.5. Moonshot's own benchmarks show Kimi as approximately level with Opus 5.5 and GPT-6 Astra - beating them on a few benchmarks, coming

    Original source ↗Software engineering
11. 11

    Quick Study

    article

    Simon WillisonOctober 23, 2026

    Tool: Quick Study Prompt to Claude Opus 5.5 High : Build an artifact where you open a photo and it rapidly (in a few seconds) paints a version of that photo using a canvas element and simulated paintbrush See also my previous experiment getting Claude Fable to simulate a watercolor illustration with P5.js. Quick Study uses Sobel edge detection , with no external libraries beyond Google Fonts. Tags: tools

    Original source ↗Software engineering
12. 12

    Quoting Armin Ronacher

    article

    Simon WillisonOctober 22, 2026

    As fun as AI is, we built so much bad software over the last 30 years, and now the universe is punishing us for our sins. — Armin Ronacher Tags: security , generative-ai , armin-ronacher , ai , ai-security-research , llms

    Original source ↗Software engineering