git pull problems

Submitted by msandli on Fri, 06/13/2014 - 02:50

linux newbie here. trying to do a git pull to get the 3.0.2 version of liggghts. performing git pull from my install directory (~/home/USERNAME/documents/liggghts - this is installed on a cygwin setup) but I get an error saying:

Updating 3fab782..3ec8c7f
error: Your local changes to the following files would be overwritten by merge:
src/style_pair.h
src/version_liggghts.h
Please, commit your changes or stash them before you can merge.
Aborting

What am I missing/doing wrong?

Forums:

Daniel Queteschiner | Fri, 06/13/2014 - 09:43

git is telling you that the local copy of LIGGGHTS on your machine has changed compared to the version originally checked out. These changes would be overwritten by the new version so it gives you the chance to save your changes. Do as it says and stash them:
git stash
Then pull the new version:
git pull
For details, see http://git-scm.com/documentation

(When compiling the new version don't forget to do a make clean-all first.)

msandli | Sat, 06/14/2014 - 01:16

did that, pulled latest version. Now i'm having another problem. I'm following the installation instructions for a windows machine as outlined here: https://github.com/CFDEMproject/LIGGGHTS-PUBLIC/wiki/Installing-LIGGGHTS....

It obviously worked once because I have been running serial simulations on it for about a week now (still having trouble getting the parallel version working, but that is for a different thread). From the src directory, I use "make clean-all" and it tells me it removed Obj_*. I then go into the src/stubs directory and use "make stubs". Then, back in the src directory, I use "make serial" and it starts doing it's thing, until it stops with the following lines of text:

../output.cpp: In member function ‘void LAMMPS_NS::Output::reset_timestep(LAMMPS_NS::bigint)’:
../lmptype.h:83:19: error: ‘INT64_MAX’ was not declared in this scope
#define MAXBIGINT INT64_MAX
^
../output.cpp:453:19: note: in expansion of macro ‘MAXBIGINT’
next_dump_any = MAXBIGINT;
^
Makefile:100: recipe for target 'output.o' failed
make[1]: *** [output.o] Error 1
make[1]: Leaving directory '/home/Trap/documents/liggghts/src/Obj_serial'
Makefile:77: recipe for target 'serial' failed
make: *** [serial] Error 2

What am I missing?