Switched to a new branch '1528785626-12904-1-git-send-email-yonghong.zhu@intel.com' Applying: BaseTools: remove including Base.h if the module type is not BASE Using index info to reconstruct a base tree... M BaseTools/Source/Python/AutoGen/GenC.py error: patch failed: BaseTools/Source/Python/AutoGen/GenC.py:2011 error: BaseTools/Source/Python/AutoGen/GenC.py: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0001 BaseTools: remove including Base.h if the module type is not BASE 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] BaseTools: remove including Base.h if the module type is not BASE