Re: Resolving conflicts

From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Dec 1, 2006, 08:10 UTC
Message-ID: <200612010810.25232.alan@chandlerfamily.org.uk>
In-Reply-To: <456FDCB5.9040907@saville.com>

On Friday 01 December 2006 07:41, Wink Saville wrote:

Show 11 quoted lines

> Alan Chandler wrote:
> > On Friday 01 December 2006 07:06, Wink Saville wrote:
> >
> > Take a look in these two files - you should see conflict markers of the
> > form <<<<<<<<<<<<<<<<
> > some content
> > ================
> > some other content
>
> That's what I thought but there isn't any "<<<<<" and git-diff also seems
> to indicate no differences:

This is at the limit of my understanding, but perhaps file permission problems could have been the cause (was also thinking white space - but to my recollection is that that DOES cause resolution markers)

I think you'll have to wait for experts from the list to comment.

-- 
Alan Chandler