Conflicts in removed files

[Algis Kabaila]

On Saturday 12 December 2009 16:41:22 Stephen J. Turnbull wrote:
> Algis Kabaila writes:
>  > brief how we (you and I) can make up a simple (articially made)
>  > example to demonstrate the problem of apparently spurious
>  > "conflicts" at merge.
>
> As pointed out by David and IIRC Stefan, the conflicts are *not*
> spurious.  
No, they are not.  They are persistent, OK?

> The issue is more subtle.  Stefan sees the conflict, notes
> that he wants to solve it in a particular way.  (It may even be the
> case that he knows in advance how he's going to resolve it.
Well, it all is too much for a simple mortal to grasp... You, evidently, know 
what Stefan wants.  What I wanted is just to extend a cooperating hand and a 
little "tea and sympathy". 

Having reached this point, I think the best is just thank Stephen JT for his 
infomative email, as well as David, Marius and Alexander for their 
clarifications.

And, whilst I do extend my sympathy to Stefan, it is far too much for me.  Let 
me just say, that "they" have responded to you email magnificently!

I learned several things from this thread and I thank you all for it.

OldAl.

-- 
Algis Kabaila, MEngSc, PhD(Eng)
http://akabaila.pcug.org.au/StructuralAnalysis.pdf