Subversion resolve for Tree Conflict

Posted: October 4th, 2009 | Author: | Filed under: Learnaholism | Tags: , , , | 8 Comments »

A little  while ago I started using Subversion or SVN for short as my centralized SCM. I have installed the VisualSVN Sever because it is easy to use and has MMC integrated easy configuration management. I have many problems with conflicts because this was a startup project and there was a many editing/deleting/moving of files. [...]

Be Sociable, Share!

8 Responses to “Subversion resolve for Tree Conflict”

  1. 8
    Scott Says:
    September 29th, 2011 at 22:09

    Just what I was looking for.

  2. 7
    Leandro Ribeiro Says:
    September 12th, 2011 at 07:51

    Thank man! This is very useful.

  3. 6
    Christian Kaltepoth Says:
    June 15th, 2011 at 10:32

    Thanks! This really saved my day! :)

  4. 5
    axel Says:
    March 12th, 2011 at 04:45

    Amazing post. I’ve saved this page to check back later.

  5. 4
    Rob Says:
    March 9th, 2011 at 15:34

    If you want to understand why conflicts occur and how to resolve them, check this tutorial out: http://www.duchnik.com/tutorials/vc/svn-conflicts

  6. 3
    Ankush Chadha Says:
    July 22nd, 2010 at 16:07

    What I have noticed with the svn resolve method is that the merge history of the files under the tree conflicted folder is lost. This is happening for svn server 1.6 and 1.6 client. However if we check the log message of the tree conflicted folder then the merge history is present but not passed on to the files under the folder.

    TortoiseSVN in general is not preserving the merge history during the svn merge operation.

    Ankush

  7. 2
    Al Says:
    January 27th, 2010 at 16:23

    Another way to resolve tree conflicts would be via TortoiseSVN (Check for Modifications on the desired folder -> select conflicts -> right-click -> Resolved).

    You can also resolve such conflicts via the SVN plugin for Eclipse (“Mark Resolved” feature).

  8. 1
    Eric Harrington Says:
    December 2nd, 2009 at 22:26

    Give BeanStalk a try. http://beanstalkapp.com/

    We use it and love it – and it integrates with our TeamSupport.com app.

    http://blog.teamsupport.com/2009/04/13/integration-with-beanstalk–hosted-subversion.aspx

Leave a Reply