This worked... Yea, that's like night and day after the 'git pull'. Process control on flashing the factory boards? I don't know if you need '--recursive' somewhere on your git scripts... or if it's just baked into the file tree...
Attempting to upgrade and possibly downgrade my board if the kernel upgrade doesn't fix my device-tree issue with ADC. On Saturday, August 8, 2015 at 5:04:13 AM UTC-7, RobertCNelson wrote: > > Odd that file has been obsolete for a year.. Run: > > git reset HEAD --hard > On Aug 8, 2015 12:30 AM, "Duane Davis" <demi...@gmail.com <javascript:>> > wrote: > >> >> root@beaglebone:/opt/scripts/tools# git pull >> Updating a4d0fe2..5fb4833 >> 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 haven't made any changes to this file. This is a new board, just >> received it today, so I haven't done anything to it other than setting up >> networking. >> >> -- >> 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 beagleboard...@googlegroups.com <javascript:>. >> For more options, visit https://groups.google.com/d/optout. >> > -- 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 beagleboard+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
