CherryPick and Revert in an edkrepo manifest PatchSet can include:
mergeStrategy="ort_ignore-all-space"
mergeStrategy="ort_theirs"
mergeStrategy="ort_ours"
This can help with PatchSet merge issues.
e.g. using Patch followed by CherryPick where the host system's git am.keepcr setting is unknown during the Patch "git am" step. https://github.com/tianocore/edk2-edkrepo/issues/244
…recipe
CherryPick and Revert in an edkrepo manifest PatchSet can include: mergeStrategy="ort_ignore-all-space" mergeStrategy="ort_theirs" mergeStrategy="ort_ours"
This can help with PatchSet merge issues. e.g. using Patch followed by CherryPick where the host system's git am.keepcr setting is unknown during the Patch "git am" step. https://github.com/tianocore/edk2-edkrepo/issues/244