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 :-) -- CeDeROM, SQ7MHZ, http://www.tomek.cedro.info _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
