Hi community,
I am trying to uplift a very old adaptation of OpenLDAP from 2.3.20 to 2.4.50. I first tried a one-step approach, cherry-picking my delta, based on 2.3.20 into 2.4.50 - but that was a daunting task, given that there is 14 years between the two releases
I am now trying again with a step-wise approach, merging one revision at a time from 2.3.20 .. 2.3.43 - and then through the 2.4 releases.
So far up to 2.3.43, this has been simple - however now, merging the 2.4 releases, I am facing a huge number of conflicts on nearly all files. It is most certainly due to a lack of ancestry between the 2.4 and 2.3 branches I assume that 2.3 has been merged to master, and 2.4 branched of master at some point, possibly before the 2.3.43 release
In short, there is a unclear, and possible collapsed merge path between the 2.3 and 2.4 branches that makes the leap between them difficult
Can someone from the development team advise, how I can get about making this transition in a smooth manner?
Thanks /Viggo