<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
  <META NAME="GENERATOR" CONTENT="GtkHTML/4.1.92">
</HEAD>
<BODY>
On Mon, 2012-02-13 at 20:26 -0500, Bradley Lucier wrote:
<BLOCKQUOTE TYPE=CITE>
<PRE>
[Bradley-Luciers-MacBook-Pro:~/programs/gambc-v4_6_4-devel] lucier% make update
>From <A HREF="http://www.iro.umontreal.ca/~gambit/repo/gambit">http://www.iro.umontreal.ca/~gambit/repo/gambit</A>
   8ccd2bd..fd08700  master     -> origin/master
Updating 15c7390..fd08700
error: Your local changes to the following files would be overwritten by merge:
        makefile.in
        prebuilt/remote-connect
Please, commit your changes or stash them before you can merge.
Aborting
M       makefile.in
M       prebuilt/remote-connect
Already on 'master'
Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
make
</PRE>
</BLOCKQUOTE>
<BR>
OK, to fix this problem, it appears that <BR>
<BR>
    27   11:33   rm makefile.in prebuilt/remote-connect<BR>
    28   11:33   git pull http://www.iro.umontreal.ca/~gambit/repo/gambit.git<BR>
    29   11:33   make<BR>
<BR>
will work.  And then "make update" doesn't bomb.
</BODY>
</HTML>