1.2 KiB
Rebasing Thorium
My primary job as the founder and main dev of Thorium is rebasing Thorium to match newer upstream Chromium versions. This is not a trivial task. This document describes my personal workflow for how I rebase the repo. If anyone notices something I could do better or faster, make a PR and edit this file along with an explanation of what should be done differently.
Rebasing would be even more of a chore if it wasn't thanks to the Chromium source code search. We have a bookmarks file located in //infra which has a (not super well organized) bookmark list of all the files thorium uses.
The bookmarks file can be imported at chrome://bookmarks. Each file will be at the current Thorium revision, and it will also show git history. If only one or two small commits were made to a file since the last version, I usually just look at the diff and manually edit files as needed. For more in depth rebasing, I find Meld invaluable. The IDE I use is Geany. Both are available for Linux, Windows, and MacOS.