Details
Description
The base problem is described here (non-public link, important slides are attached) under "Production upgrade".
It's not possible to upgrade from one minor version to another, because new minor versions are (in general) not descendants of older minor versions from Git's perspective. This means that conflicts are guaranteed in the versions of the services included in each release.