Switched to a new branch '20190513134714.3124-1-wei.liu2@citrix.com'
Applying: gitignore: ignore .vscode directory
Applying: public/tmem.h: fix version number in comment
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	xen/include/public/tmem.h
Falling back to patching base and 3-way merge...
Auto-merging xen/include/public/tmem.h
CONFLICT (content): Merge conflict in xen/include/public/tmem.h
Patch failed at 0001 public/tmem.h: fix version number in comment
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:
[Xen-devel] [PATCH 2/4] public/tmem.h: fix version number in comment