Login | Register
My pages Projects Community openCollabNet

Discussions > users > [Subclipse-users] How do I resolve a tree conflict using Subclipse?

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

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

Author jacobweber
Full name Jacob Weber
Date 2010-04-21 16:40:26 PDT
Message Can someone give me a quick tutorial on resolving tree conflicts with Subclipse?

For example, say I deleted a file in branch A, and edited it in branch B. When I merge B into A, I get a tree conflict. In the Tree Conflicts view, it says "local missing, incoming edit upon merge". So far so good.

Now, in order to resolve this conflict, I need to see what changes were made to the file in B. How do I do this? I don't see any way to do it from the Resolve dialog.

It gives me the option to compare the file to an arbitrary file or folder, which I select from the workspace. Why would I want to do this, when the local file has been deleted? Wouldn't I just want to compare it to the common parent of the two branches?

(The Compare/Merge target selection is a little strange too. When the conflict is on a file, it lets me select multiple files as targets, although it only seems to use one of them. When the conflict is on a folder, or on a file with no extension, it lets me select a folder as a target. But in this case I can select from anywhere in the workspace, not just the relevant project.)

Any help would be appreciated. Thanks,
Jacob

« Previous message in topic | 1 of 3 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-users] How do I resolve a tree conflict using Subclipse? jacobweber Jacob Weber 2010-04-21 16:40:26 PDT
     Re: [Subclipse-users] How do I resolve a tree conflict using Subclipse? selsemore Stephen Elsemore 2010-04-23 07:46:02 PDT
         RE: Re: [Subclipse-users] How do I resolve a tree conflict using Subclipse? jacobweber Jacob Weber 2010-04-23 08:02:50 PDT
Messages per page: