Odd that file has been obsolete for a year.. Run: git reset HEAD --hard On Aug 8, 2015 12:30 AM, "Duane Davis" <[email protected]> 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 [email protected]. > 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
