Switched to a new branch '20180809060612.9800-1-chao.b.zhang@intel.com'
Applying: SecurityPkg: HashLib: Update HashLib file GUID
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
M	SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
Falling back to patching base and 3-way merge...
Auto-merging SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
CONFLICT (content): Merge conflict in SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
Auto-merging SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
CONFLICT (content): Merge conflict in SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
Patch failed at 0001 SecurityPkg: HashLib: Update HashLib file GUID
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] SecurityPkg: HashLib: Update HashLib file GUID