You can also see my workflow for patching godot engine so it's mergable on a rebased master or stable release.

> This project uses git-assembler to simplify merging patches on top of the latest stable release by allowing each patch to be in a separate branch, so they can all be merged into a fresh branch without complicating the revision history.

https://github.com/KeyboardDanni/godot-for-sidescrollers

I'm https://github.com/fire