Andrew Rogers ha scritto: > Hi All, > > I am working a few hours a week trying to get SWD working for the STM32 > Primer2 (R-Link interface). I am happy making changes to the source code > to accomplish this. The problem is that my changes span many files > because OpenOCD is pretty well married up to JTAG. I am taking the > opportunity to create an interface struct that can be type-cast to JTAG > or SWD struct and later extended to UART. The problem I've got is that I > know nothing about git and get problems trying to pull the latest > revisions and merging them with my working copy. I try > > $ git pull > Updating e901cee..2821115 > error: Entry 'src/jtag/core.c' not uptodate. Cannot merge.
That means your working copy has local modifications, so you can't do a merge. You can solve it in two ways: - either commit everything before doing a 'git pull'. You can always do that since git is a DSCM and commit and merge operations are two distinct phases; - or, if you really can't wait to get the latest commits, you can do a git stash, then git pull, then git stash apply. I'd go for the first alternative. Does anyone has better suggestions? Best regards, -- Luca Ottaviano <lottavi...@develer.com> BeRTOS developer -> http://dev.bertos.org _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
