How does the release of v5 happen in terms of git management?

[PascalVorwerk]

I am following the development of all the v5 components, because we are excited to start using them ofcourse! I was just wondering how the general approach is to releasing this version? Is there just a giant merge at the end of all the work, or how do you guys do it with such a big overhaul compared to previous versions? For example i saw some branches were some 3100 commits behind the current development branch.. surely this is gonna cause major merge conflicts! 😝

Purely a out of interest question, i bet you guys have done this before haha

[vnbaaij]

All version exist in their own branch. We do not merge all code into the dev or main branch ever. That is why you see those large numbers of commits behind. At a certain point dev-v5 will be renamed to dev whereas the dev branch will then be renamed to archives-v4 before that.
We can backport code for fixes and or enhancements from dev to older versions by cherry picking from dev in the archive branches.