Get your changes as git patches and apply them to the upstream releases. If a merge conflict happens, fix it and continue.

Here’s an example for the patches of Librewolf that are done onto every Firefox release: librewolf.dev/librewolf/source/src/…/patches