On Fri, Mar 22, 2013, Scott Brozell wrote:
> ...
> %rm -fr AmberTools/src/paramfit/*
> %git ls-files -d | xargs -t git checkout --
> Your branch is behind the tracked remote branch 'origin/master' by 120 commits,
> and can be fast-forwarded.
> %git pull
> Updating c147f84..b185632
> error: Untracked working tree file 'AmberTools/test/paramfit/dihedral_perfect_fit_NMA/Job_Control.in' would be overwritten by merge.
Looks like you are making progress. "git status" is a good way to see what
git thinks about the state of your tree.
>
> Various variations of above ultimately fail the same way.
cf. the usual complaints we usually post to the Amber users' mailing list when
there were not enough details for other people to be of much help.
For example, what does git status report? Is Job_Control.in a new file? I'm
guessing that it might be created during a test run, but is also under git
control.
> Note that I was uptodate a few days ago and had made no modifications.
Did you run tests in this directory tree? That could introduce modifications.
(Although that doesn't happen for me, as far as I can tell....)
...dac
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Mar 22 2013 - 08:30:02 PDT
