Re: [ptp-dev] Problems with synchronizing

["Randy M. Roberts" <rsqrd@xxxxxxxx>]

Nathan,

I was afraid of this.  I can come over today or tomorrow afternoon, let
me know when is best.

R^2

On Wed, 2006-08-09 at 14:23 -0600, Nathan DeBardeleben wrote:
> 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.
>