Resolving Tree Conflicts using Subclipse

About Mark Phippard

Engineering manager for several teams at CollabNet, including CloudForge, Subversion, Subversion Edge, Git and our Desktops and Integrations. Project owner for the Subclipse project, which provides Subversion support in Eclipse. Also a full committer for the Subversion project. Product owner for GitEye, Subversion Edge and the CollabNet Desktops and Integrations.

  6 comments for “Resolving Tree Conflicts using Subclipse

  1. valentijn
    November 9, 2010 at 10:53 am

    Nice explanation. I find however that most tree conflicts occur when merging, not when updating. Do you see any conceptual differences?

  2. valentijn
    November 9, 2010 at 10:56 am

    Another issue sometimes occurs is that people don’t rename correctly. Resulting in delete+add. I haven’t used the merge target yet, but I assume it’ll work just as well in this case?

  3. valentijn
    November 9, 2010 at 11:03 am

    I find the naming confusing. Left and right? Why not use working copy and incoming or repository.

  4. November 9, 2010 at 11:05 am

    The purpose of this post was to try to treat the concept of tree conflicts generically. I give a couple of examples to show the tools and options that are available to resolve them and also just to help understand what they are and what Subversion is trying to tell you.
    The Resolve option in the SVN Tree Conflicts view will vary the options it presents you to resolve the conflict based on the details of your conflict. If you have further questions, they would be better asked in our Subversion Client discussion forum.
    http://subversion.open.collab.net/ds/viewForumSummary.do?dsForumId=4

  5. Dave
    June 18, 2014 at 7:05 pm
  6. Ronald Wouters
    July 18, 2014 at 4:28 am

    The links to the screenshot(s) seem to be broken…

Leave a Reply

Your email address will not be published. Required fields are marked *

*

CAPTCHA Image

*