
The problem is in fact that not all branches are merged together and it usually causes conflicts on version string (documentation, config, changelog,...). By simply using branch we're merging to STABLE/TESTING we will get the correct merge.
The problem is in fact that not all branches are merged together and it usually causes conflicts on version string (documentation, config, changelog,...). By simply using branch we're merging to STABLE/TESTING we will get the correct merge.