From mboxrd@z Thu Jan  1 00:00:00 1970
From: Charles Millar <millarc@verizon.net>
Subject: Problem updating Org
Date: Thu, 02 Jan 2014 13:55:16 -0500
Message-ID: <52C5B614.2050609@verizon.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57859)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <millarc@verizon.net>) id 1VynQi-00010Z-VT
	for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 13:55:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <millarc@verizon.net>) id 1VynQd-0004Kl-KG
	for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 13:55:40 -0500
Received: from vms173021pub.verizon.net ([206.46.173.21]:65039)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <millarc@verizon.net>) id 1VynQd-0004Kc-FE
	for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 13:55:35 -0500
Received: from [127.0.0.1] ([unknown] [70.209.134.112])
	by vms173021.mailsrvcs.net
	(Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16
	2009)) with ESMTPA id <0MYS004IBF85E730@vms173021.mailsrvcs.net> for
	emacs-orgmode@gnu.org; Thu, 02 Jan 2014 12:55:19 -0600 (CST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

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