Frequent and complex merges are inevitable if one maintains a few patches to an actively developed upstream and the upstream either does not want them or the pa

Frequent and complex merges are inevitable if one maintains a few patches to an actively developed upstream and the upstream either does not want them or the patches are too specific to the product to be a part of the upstream.