[AMBER-Developers] Potential GIT conflicts with AmberTools/test/cpptraj

From: Daniel Roe <daniel.r.roe.gmail.com>
Date: Fri, 31 Jul 2015 14:17:48 -0600

Hi all,

If you do a GIT pull and get a message about a conflict with
AmberTools/test/cpptraj it can be resolved from the top dir with git clean:

git clean -fd AmberTools/test/cpptraj

Then attempt your pull again. This is due to a recent move of the cpptraj
tests.

-Dan

-- 
-------------------------
Daniel R. Roe, PhD
Department of Medicinal Chemistry
University of Utah
30 South 2000 East, Room 307
Salt Lake City, UT 84112-5820
http://home.chpc.utah.edu/~cheatham/
(801) 587-9652
(801) 585-6208 (Fax)
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers

Received on Fri Jul 31 2015 - 13:30:02 PDT