Nicolas Guichard
3 results
Working on Multiple Git Branches without Switching
A Git workflow with --rebase-merges and --update-refs
2 October 2025
This workflow uses Git's --rebase-merges and --update-refs features to manage multiple branches without ever switching between them. By committing everything to a single integration branch and using interactive rebase to restructure and update multiple branches at once, you maintain clean history, adapt to any review system, and avoid branch divergence - all using native Git tools.
Nicolas shows how to work on parallel Git branches without having to switch between them thanks to Git's `--rebase-merges` feature.
Improvements to Mozilla's Searchfox Code Browser
How KDAB Helped with Java/Kotlin Support and C++ Macro Expansions
17 December 2024
Mozilla is the maker of the famous Firefox web browser and the birthplace of the likes of Rust and Servo (read more about Embedding the Servo Web Engine in Qt). Firefox is a huge, multi-platform, multi-language project with 21 million lines of code back in 2020, according to their own blog post. Navigating in projects […]
