We have been working on our custom version of the firmware for a bit over a year now.
We want to stay up to date with the latest stable version but I’m not sure if our workflow to update is optimal. I’m looking for guidance on the best practices in terms of maintaining a custom firmware version?
Currently our custom code branches off release/v1.10 we would like to v1.11 but rebasing our branch on v1.11 seems not straight forward. There are conflict on files that we haven’t touch as well as on every submodule changes.
So, I tried rebasing release/v1.11 on release/v1.10 and run in the same conflicts. Rebasing with -Xtheirs did help a bit but still I aborted. I’ve then tried merging release/v1.11 on to release/v1.10 and it worked almost seamlessly except for deleted files (as expected) and some submodule (unexpected).
I haven’t went further about bringing our branch up to date.