Trying to figure out the best way to run my Pleroma modifications on my real sites before getting them merged upstream, to increase confidence and confirm they work as expected. And to get fixes to users faster.

The problem is all my sites use the stable branch, and this code needs to be merged into develop.

So I think I need to start every modification from the stable branch, and merge develop into it for the upstream MR.

But I don’t want to merge stable back in after each release, I want to rebase my unmerged changes back over it. So now I’m wondering if I should manage them as patch files: https://mijingo.com/blog/creating-and-applying-patch-files-in-git

Yes I’m overcomplicating this. I’ve been wanting to do it for months now.