WTF? Nothing I do clears this up. I've tried checking out the files, and
I've tried git stash followed by git stash drop. Nothing works so far...
/media/work/slegrand/amber/amber$ git checkout master
M
AmberTools/test/mmpbsa_py/04_Per_Residue_Decomp/DECOMP_ENERGY_VECTORS.csv.save
M AmberTools/test/mmpbsa_py/08_Stability/FINAL_DECOMP_MMPBSA2.csv.save
Already on 'master'
/media/work/slegrand/amber/amber$ git reset --hard
HEAD is now at e5d1d81 add the kappa value of QM ewald calcultations to the
name list
/media/work/slegrand/amber/amber$ git checkout spfp-dev
error: You have local changes to
'AmberTools/test/mmpbsa_py/08_Stability/FINAL_DECOMP_MMPBSA2.csv.save';
cannot switch branches.
/media/work/slegrand/amber/amber$ git checkout master
M
AmberTools/test/mmpbsa_py/04_Per_Residue_Decomp/DECOMP_ENERGY_VECTORS.csv.save
M AmberTools/test/mmpbsa_py/08_Stability/FINAL_DECOMP_MMPBSA2.csv.save
Already on 'master'
/media/work/slegrand/amber/amber$
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Wed Apr 25 2012 - 14:30:02 PDT
