Switched to a new branch '20180812140148.31669-1-ming.huang@linaro.org' Applying: MdePkg Cper.h: Add generic error macros for ARM platform error: patch failed: MdePkg/Include/Guid/Cper.h:256 error: MdePkg/Include/Guid/Cper.h: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Using index info to reconstruct a base tree... Patch failed at 0001 MdePkg Cper.h: Add generic error macros for ARM platform The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Failed to apply patch: [edk2] [PATCH edk2/MdePkg v1 1/1] MdePkg Cper.h: Add generic error macros for ARM platform