Resync a PD branch and keep both branches' changes
Resync a PD branch so it updates while keeping the modifications made in both branches, knowing that a conflicting PD-branch change is dropped.
Resync in a PD branch updates it while trying to keep the modifications made in both branches.
Where a PD-branch change conflicts with the design branch, the PD-branch change is dropped.