[ptp-dev] Problems with synchronizing

[Nathan DeBardeleben <ndebard@xxxxxxxx>]

I'm having a ton of problems synchronizing.  Perhaps I need to get Randy 
to come over to my office and help me out.  I'm finding synchronizing is 
adding in changes to imports that don't exist on the head, which 
subsequently immediately give compile errors.  I'm finding major 
structural changes already committed which are drastically changing what 
I have changed.  This isn't going to be easy or fixable overnight as I 
had hoped.

I'm not really sure what to do at this point.  The number of conflicts 
is staggering and they're major ones.

--
-- Nathan
Correspondence
---------------------------------------------------------------------
Nathan DeBardeleben, Ph.D.
Los Alamos National Laboratory
Parallel Tools Team
High Performance Computing Environments
phone: 505-667-3428
email: ndebard@xxxxxxxx
---------------------------------------------------------------------