On Tue, Jan 19, 2016 at 2:19 PM, Harry Arends Fotografie <[email protected]> wrote: > Now i got a new error: > > root@beaglebone:/opt/scripts/tools# git pull > Updating a4d0fe2..2be47e9 > error: Your local changes to the following files would be overwritten by > merge: > tools/beaglebone-black-eMMC-flasher.sh > Please, commit your changes or stash them before you can merge. > Aborting > > I am new to this so........
git reset HEAD --hard git pull Regards, -- Robert Nelson https://rcn-ee.com/ -- For more options, visit http://beagleboard.org/discuss --- You received this message because you are subscribed to the Google Groups "BeagleBoard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
