Switched to a new branch '47C64442C08CCD4089DC43B6B5E46BC48AC6CA@shsmsx102.ccr.corp.intel.com' Applying: BaseTools: Use gGuidPattern for Guid regular expression error: patch failed: BaseTools/Source/Python/GenFds/GenFds.py:42 error: BaseTools/Source/Python/GenFds/GenFds.py: 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... M BaseTools/Source/Python/GenFds/GenFds.py Patch failed at 0001 BaseTools: Use gGuidPattern for Guid regular expression 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: Use gGuidPattern for Guid regular expression