Hi,
could you rebase to master branch?
Thanks!
git am <~/Desktop/0001-Fix-command-parsing-fix-errors-to-have-more-sense.patch
Applying: Fix command parsing, fix errors to have more sense.
/home/oyvind/workspace/openocd/.git/rebase-apply/patch:36: trailing whitespace.
else
error: patch failed: src/jtag/drivers/buspirate.c:262
error: src/jtag/drivers/buspirate.c: patch does not apply
Patch failed at 0001 Fix command parsing, fix errors to have more sense.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
--
Øyvind Harboe
Can Zylin Consulting help on your project?
US toll free 1-866-980-3434 / International +47 51 87 40 27
http://www.zylin.com/zy1000.html
ARM7 ARM9 ARM11 XScale Cortex
JTAG debugger and flash programmer
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
