[ovs-dev] [PATCH] Fix travis CI compilation issue for OSX job
robot at bytheb.org
Fri Jan 24 09:56:23 UTC 2020
Bleep bloop. Greetings Numan Siddique, I am a robot and I have tried out your patch.
Thanks for your contribution.
I encountered some error that I wasn't expecting. See the details below.
fatal: sha1 information is lacking or useless (lib/actions.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Fix travis CI compilation issue for OSX job
The copy of the patch that failed is found in:
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Please check this out. If you feel there has been an error, please email aconole at redhat.com
More information about the dev