Comments on: Easy SVN Conflict Resolution http://blog.eflow.org/archives/239 Insert some amazingly witty tagline here Tue, 06 Sep 2011 10:36:05 +0000 hourly 1 http://wordpress.org/?v=3.0.3 By: Rob http://blog.eflow.org/archives/239/comment-page-1#comment-506 Rob Wed, 09 Mar 2011 14:42:09 +0000 http://blog.eflow.org/?p=239#comment-506 This is very dangerous if you don't know what you are doing, as you can lose a lot of work, since you haven't committed your own work yet due to the conflicts. Check out this tutorial that explains how to resolve conflicts in subversion: http://www.duchnik.com/tutorials/vc/svn-conflicts This is very dangerous if you don’t know what you are doing, as you can lose a lot of work, since you haven’t committed your own work yet due to the conflicts.

Check out this tutorial that explains how to resolve conflicts in subversion:

http://www.duchnik.com/tutorials/vc/svn-conflicts

]]> By: haroon ur rashid http://blog.eflow.org/archives/239/comment-page-1#comment-446 haroon ur rashid Wed, 29 Dec 2010 08:04:39 +0000 http://blog.eflow.org/?p=239#comment-446 Thats it! Its a life saver. Or at least a time saver. (This can be dangerous. Make sure you have resolved all true conflicts in the branch before doing the “resolve all”) Thats it! Its a life saver. Or at least a time saver.

(This can be dangerous. Make sure you have resolved all true conflicts in the branch before doing the “resolve all”)

]]> By: Ben http://blog.eflow.org/archives/239/comment-page-1#comment-444 Ben Tue, 07 Dec 2010 19:03:37 +0000 http://blog.eflow.org/?p=239#comment-444 WP was "helpfully" changing the -- to the extended hyphen for me automatically. I added some pre tags to prevent that. Thanks Ivan! WP was “helpfully” changing the — to the extended hyphen for me automatically. I added some pre tags to prevent that. Thanks Ivan!

]]> By: Ivan Alfaro http://blog.eflow.org/archives/239/comment-page-1#comment-443 Ivan Alfaro Tue, 07 Dec 2010 18:59:56 +0000 http://blog.eflow.org/?p=239#comment-443 Correction: svn resolve -R –-accept theirs-full * Correction: svn resolve -R –-accept theirs-full *

]]> By: jimbo http://blog.eflow.org/archives/239/comment-page-1#comment-360 jimbo Wed, 23 Sep 2009 17:16:13 +0000 http://blog.eflow.org/?p=239#comment-360 You want to use the --reintegrate option on merge on the merge back from the branch. You want to use the –reintegrate option on merge on the merge back from the branch.

]]>