First thing I tried was to rebase your master branch on top of origin/master and that didn't work...
Could you rebase it on top of master branch and force a push? Below "swd" refers to your git repository and "origin" to the OpenOCD repository. git fetch origin git checkout swd/master git rebase origin/master git push swd HEAD:master -f -- Ø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 Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
