On Tue, Aug 1, 2017 at 5:16 PM, David A Case <dacase.chem.rutgers.edu>
wrote:
>
>
> 3. You may find that git reports conflicts or problems if you try a "git
> pull"
> in the master branch. The most straightforward thing is to save any
> uncommitted work you have, and do a "git clean -f -x d" in your working
> directory, or (if it's needed) re-clone from git.ambermd.org. Note that
> you need to follow the submodule instructions if you've not been doing
> that:
>
> ambermd.org/pmwiki/pmwiki.php/Main/Submodules
For those who have been using amber submodules: You need to "deinit" then
"init" again (due to some recent changes to resolve merge conflict)
cd $AMBERHOME
git pull # update master from upstream
git submodule deinit -f . # -f : force
git submodule update --init # you will see git will clone a bunch of
submodules from github.
Hai
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Tue Aug 01 2017 - 15:30:02 PDT
