RE: Re: [Subclipse-users] How do I resolve a tree conflict using Subclipse?

Thanks for the detailed explanation. I'll have to give it some thought, but I wanted to respond to this:

> You suggested providing an option to compare branchB/f1 to f1's
> common parent in the two branches, but I don't know that even this
> would be perfect. For example, there might be previous branchB/f1
> changes that have already been merged into branchA/f1 in the past.

I was thinking of what you see in a normal merge conflict. If I'm not mistaken, it's doing a three-way compare, and on the right side it's comparing the common parent to the incoming file. I think this takes into account revisions that have already been merged, doesn't it? Does SVN provide enough information to show that side of the comparison, when there's a tree conflict on a local delete?

Jacob

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2593590

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-04-23 17:02:52 CEST