Skip to Content.
Sympa Menu

emacspeak - Re: [Emacspeak] Problem updating emacspeak on mac

Subject: Emacspeak discussion list

List archive

Re: [Emacspeak] Problem updating emacspeak on mac

Chronological Thread 
  • From: Robert Melton <lists AT>
  • To: Greg Wocher <gtwocher AT>
  • Cc: Emacspeaks <emacspeak AT>
  • Subject: Re: [Emacspeak] Problem updating emacspeak on mac
  • Date: Wed, 24 Apr 2024 15:09:00 -0400

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 AT> 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 AT
> To unsubscribe send email to:
> emacspeak-request AT with a subject of: unsubscribe

Robert "robertmeta" Melton
lists AT

Archive powered by MHonArc 2.6.19+.

Top of Page