I’ve developed a product. I have a base version of it, but then there are customer specific developments that I managed in specific branches that derive from the main base product branch.

What is the best strategy to merge a new base functinality to the customer branches? The ideal is also automate it as well.