Re: [Emacspeak] Problem updating emacspeak on mac

[Robert Melton <lists@xxxxxxxxxxxxxxxx>]

That implies that you did what it says, made a modification.  

If you want to discard whatever changed, you can do:

- git reset --hard 
- git pull

> On Apr 24, 2024, at 12:43, Greg Wocher (via emacspeak Mailing List) <emacspeak@xxxxxxxxxxxxx> wrote:
> 
> Hello,
> I am trying to update my version of emacspeak on my mac and I am running into an error. When I move into my emacspeak directory in the terminal and I type git pull, I get the following error:
> error: Your local changes to the following files would be overwritten by merge:
> lisp/emacspeak-speak.el
> Please commit your changes or stash them before you merge.
> Aborting
> Am I upgrading emacspeak the right way by doing a git pull from the directory or is there another way? 
> 
> Thanks,
> Greg Wocher
> 
> Emacspeak discussion list -- emacspeak@xxxxxxxxxxxxx
> To unsubscribe send email to:
> emacspeak-request@xxxxxxxxxxxxx with a subject of: unsubscribe

--
Robert "robertmeta" Melton
lists@xxxxxxxxxxxxxxxx