[ovs-dev] [PATCH v3 ovn] Add missing checkpatch.py script

Aaron Conole aconole at redhat.com
Tue Aug 20 21:31:53 UTC 2019

0-day Robot <robot at bytheb.org> writes:

> Bleep bloop.  Greetings Lorenzo Bianconi, 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.
> git-am:
> error: The following untracked working tree files would be overwritten by merge:
> 	utilities/checkpatch.py
> Please move or remove them before you can merge.
> Aborting
> Failed to merge in the changes.
> Patch failed at 0001 Add missing checkpatch.py script
> The copy of the patch that failed is found in:
>    /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/OVN/.git/rebase-apply/patch
> 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".

Oops!  This is a bug in the robot.  I'll fix it up.

> Please check this out.  If you feel there has been an error, please email aconole at redhat.com
> Thanks,
> 0-day Robot
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

More information about the dev mailing list