[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Documentation suggested to clearer state restrictions to merg ing
|
From: |
Cameron, Steve |
|
Subject: |
RE: Documentation suggested to clearer state restrictions to merg ing removed files |
|
Date: |
Thu, 7 Dec 2000 16:09:02 -0600 |
Derek Price wrote:
[...]
> Yes you can - 4 way merges aren't necessary. What you're actually
> assuming is
> that all a merge cares about is the differences between the greatest
> common
> ancester (gca) of newtag and the destination. In the simple backout case
> this
> simplifies to newtag:
[...brain-hurting text omitted...]
> All the other cases I could come up with simplify into one of the above.
>
> Hmmm?
[smc] Um, yeah, what he said, "Hmmm." Oww. My brain hurts.
I'll have to think about htat one some, but it seems to make sense.