Re: [AMBER-Developers] GIT merge problem?

From: Daniel Roe <daniel.r.roe.gmail.com>
Date: Fri, 10 Jan 2014 13:27:28 -0700

Hi,

Dave's fix seems to have worked. I can pull now with no issues. Thanks!

-Dan


On Fri, Jan 10, 2014 at 1:06 PM, Jason Swails <jason.swails.gmail.com>wrote:

>
>
> > On Jan 10, 2014, at 2:36 PM, David A Case <case.biomaps.rutgers.edu>
> wrote:
> >
> >> On Fri, Jan 10, 2014, Daniel Roe wrote:
> >>
> >> I think a problem may have just occurred with the GIT tree. DOne of the
> last
> >
> > Indeed....I'm aware of this and working on it. I think the best
> "solution"
> > for now is to not push or pull from git.ambermd.org until we get things
> > straightend out.
> >
> > [Jason happens to be offline today, or it would probably already have
> been
> > fixed.]
>
> Apologies here. I'm connected only by a (dying) smartphone for the rest of
> the day. If any more cleaning has to be done following Dave's latest commit
> I'll fix it tonight (EST).
>
> I'll also try to update the .gitignore to prevent this type of thing from
> happening again.
>
> All the best,
> Jason
>
> --
> Jason M. Swails
> BioMaPS,
> Rutgers University
> Postdoctoral Researcher
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>



-- 
-------------------------
Daniel R. Roe, PhD
Department of Medicinal Chemistry
University of Utah
30 South 2000 East, Room 201
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 Jan 10 2014 - 12:30:04 PST
Custom Search