Try checking out the version already in HEAD: git checkout -- lisp/ox-html.el

Then pull again. 

Nathan DeGruchy
nathan@degruchy.org

> On Jan 2, 2014, at 1:55 PM, Charles Millar <millarc@verizon.net> wrote:
> 
> I update org daily (at least I try to) using make-update2 in Cygwin git.
> Today I received the following message
> 
> - - - - begin message - - - -
> rm -f
> git checkout
> D    contrib/lisp/ob-groovy.el
> M    contrib/lisp/ob-oz.el
> M    contrib/lisp/org-mac-link.el
> M    lisp/ob-C.el
> D    lisp/ob-J.el
> M    lisp/ob-latex.el
> M    lisp/ob-maxima.el
> M    lisp/org-agenda.el
> M    lisp/org-element.el
> M    lisp/org-habit.el
> M    lisp/org-inlinetask.el
> M    lisp/org-table.el
> M    lisp/org.el
> M    lisp/ox-html.el
> M    lisp/ox-latex.el
> M    lisp/ox-texinfo.el
> M    lisp/ox.el
> M    testing/lisp/test-ob.el
> M    testing/lisp/test-ox.el
> Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
> git remote update
> Fetching origin
> From git://orgmode.org/org-mode
>   13bb116..6e51188  master     -> origin/master
>   1a3591c..03ce57e  maint      -> origin/maint
> git pull
> error: Your local changes to the following files would be overwritten by merge:
>    lisp/ox-html.el
> Please, commit your changes or stash them before you can merge.
> Aborting
> Updating e23bbda..6e51188
> mk/targets.mk:111: recipe for target 'up0' failed
> make: *** [up0] Error 1
> - - - - end message - - - -
> 
> I have not opened ox-html.el and I do not export to html. (I do export to LaTeX.)
> 
> GNU Emacs 24.3.1 (i386-mingw-nt6.0.6002) of 2013-03-17 on MARVIN
> Org-mode version 8.2.4 (release_8.2.4-357-gda05ab.dirty @ c:/cygwin/home/owner/.elisp/org-mode/lisp/)
> 
> Charlie Millar
> 
> ---
> This email is free from viruses and malware because avast! Antivirus protection is active.
> http://www.avast.com
> 
>