On Fri, Jun 10, 2011 at 4:57 AM, Tomek CEDRO <tomek.ce...@gmail.com> wrote: > On Tue, Jun 7, 2011 at 5:02 PM, Øyvind Harboe <oyvind.har...@zylin.com> wrote: >> 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? > > I also have problem with merge conflict in src/jtag/core.c :-( How can > I check what has changed against openocd/master and eventually fix > those changes? > > I did: > git clone ssh://...@repo.or.cz/srv/git/openocd/libswd.git > git remote add openocd > git fetch openocd > git rebase openocd/master > ... > CONFLICT(content): Merge conflict in src/jtag/core.c > .. > Failed to merge in changes. > Patch fail at 0005 ... > > Help :-) I am new to git :-)
open src/jtag/core.c, search for <<<< and resolve the conflicts for the commit that rebase is trying to apply. When you are done: git add src/jtag/core.c git rebase --continue -- Ø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
