-
Git Super-Power: The Three-Way Merge
tl;dr: git config –global merge.conflictstyle diff3 In my previous post, I preached about the one true way to merge MRs in a git workflow. The answer is obviously to rebase for conflicts, and a merge commit for posterity of the MR. What I did not talk about is that there is a reason that push…
-
Merging Responsibly
tl;dr: I do not like merging the main branch into feature branches, and I do not like squashing MR/PRs git commit git has emerged as the obvious choice for SCCS (Source Code Control System). The consensus is that it is unambiguously better than the previous standard, SVN. There is some debate as to what is…
-
ViHN: Vim for Hacker News
tl;dr: I made ViHN to read Hacker News without having to move my hands away from the keyboard. It’s freely available on Firefox and Chrome. This is about yet another Hacker News extension. But other people with my obsession for killing the mouse might enjoy it. Most of the content of this article is just…
-
Rewriting NHK Easier in Rust
The Christmas holidays are the perfect time of the year to shut oneself in, talk to no one, and pour days into staring at a computer screen. So, naturally, I rewrote my longest-actually-running project in Rust 🦀. The Challenge Many Words NHK Easier serves news written in simple Japanese for language learners. It has a…
-
Dynamic Programming is not Black Magic
This year’s Advent of Code has been brutal (compare the stats of 2023 with that of 2022, especially day 1 part 1 vs. day 1 part 2). It included a problem to solve with dynamic programming as soon as day 12, which discouraged some people I know. This specific problem was particularly gnarly for Advent…
About Me
I found the Dark Side in elementary school in a book from the local public library that taught me QuickBASIC. Nowadays, I mostly use Python, C and C++. In the meantime, I got a Master in computer science from École normale supérieure de Lyon because I wanted to really understand how computers work. Then I got a PhD in mathematics from École normale supérieure because cryptography is fun.