On Mon, 2012-02-13 at 20:26 -0500, Bradley Lucier wrote:
[Bradley-Luciers-MacBook-Pro:~/programs/gambc-v4_6_4-devel] lucier% make update
>From http://www.iro.umontreal.ca/~gambit/repo/gambit
   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

OK, to fix this problem, it appears that

    27 11:33 rm makefile.in prebuilt/remote-connect
    28 11:33 git pull http://www.iro.umontreal.ca/~gambit/repo/gambit.git
    29 11:33 make

will work.  And then "make update" doesn't bomb.