[gambit-list] New make update problems

Bradley Lucier lucier at math.purdue.edu
Mon Feb 13 20:26:11 EST 2012


[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

Marc, it's like we're looking over your shoulder downloading your private Gambit repository, hoping it will work.

This is not a good feeling.

Brad


More information about the Gambit-list mailing list