[AMBER-Developers] I don't want to change these files... really!

From: David Cerutti <dscerutti.gmail.com>
Date: Wed, 20 Sep 2017 14:22:46 -0400

I'm hoping someone can help me to understand what's going on with my merges
from SpeedBoostSM into master. I'm preparing to commit my performance
enhancements, and the merge goes more or less smoothly except that, after I
merge from commit d3db6730442cee05bc7c048b0bb89213d9a6000f of SpeedBoostSM
(the point at which I deemed things in a suitable state--I've made other
commits since then to continue progress), I am still getting the following:

On branch master
Your branch is ahead of 'origin/master' by 59 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified: ../../../../AmberTools/src/ambertools-binary-build (new
        modified: ../../../../AmberTools/src/cpptraj (new commits)

Untracked files:

It's the business of ambertools-binary-build bearing "changes" (which, for
all I can tell with git diff, are perhaps one whitespace character)--same
with the cpptraj directory. When I checkout these files / directories from
master I still see "Changes not staged for commit."

Hai pointed out a similar issue in one of my previous commits involving the
test cases. I'm not sure what it is, but something seems to be
persistently lacing these files with some miniscule tweak that I can't help
but make--I'm not doing anything to these files deliberately. Can anyone
suggest what might be going on?


AMBER-Developers mailing list
Received on Wed Sep 20 2017 - 11:30:04 PDT
Custom Search