Merging two branches that cherry-picked the same commits

When two feature branches have each cherry-picked the same upstream commits with -x, a plain merge of both produces conflicts. The picks have different SHAs and sometimes different conflict resolutions. A cleaner way: take one side as the base, after checking that its copies of the picked files are byte-identical to the other side's. Then apply only the other branch's commits after its picks, with a 3-way merge (e.g. merge or cherry-pick the range <last-pick>..<tip>). Also, when both branches fixed the same flaky test in different ways, choose one version deliberately rather than taking a textual union.