Switched to a new branch '20170425192615.6152-1-alinefm@linux.vnet.ibm.com'
Applying: Get server arch from /config Wok API instead of relying on Ginger Base
fatal: sha1 information is lacking or useless (ui/js/src/kimchi.api.js).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Get server arch from /config Wok API instead of relying on Ginger Base
The copy of the patch that failed is found in:
   /var/tmp/tmpec3vsq_w/.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:
[Kimchi-devel] [PATCH] [Kimchi] Get server arch from /config Wok API instead of relying on Ginger Base