On Wed, Apr 25, 2012 at 5:15 PM, Scott Le Grand <varelse2005.gmail.com>wrote:
> 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
>
What was this for? My suggestion: do a git pull here to update your master
branch with the git server.
> 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';
>
This means that switching branches will lose information, which git will
not let you do. Do a "git status" to take a look at the files that are
different. It will also give a list of untracked files (which is a ton if
you've built amber -- you can suppress this with the tips on the Wiki).
You can discard changes made to any file (which is what is preventing you
from checking out a new branch here) by checking that file out:
git checkout
AmberTools/test/mmpbsa_py/08_Stability/FINAL_DECOMP_MMPBSA2.csv.save
Alternatively, if the file is not being tracked, just get rid of it (it'll
come back if it's tracked in another branch).
cannot switch branches.
> /media/work/slegrand/amber/amber$ git checkout master
>
You are already on master here. You can type "git branch" to see what
branch you are currently on. Alternatively, you can add something like
this to your PS1 so that the prompt tells you what branch you're on:
(__git_ps1 " (%s)")
In my .bashrc I have this:
export PS1='\[\033[01;32m\]\u.\h\[\033[01;34m\] \w$(__git_ps1 " (%s)")
\$\[\033[00m\] '
This requires git with bash-completion, I think, but I find it useful.
Was this helpful?
--Jason
--
Jason M. Swails
Quantum Theory Project,
University of Florida
Ph.D. Candidate
352-392-4032
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Wed Apr 25 2012 - 15:00:03 PDT
