Comments on: Subversion tree conflicts make my brain hurt http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/ Here lies da booty Fri, 02 Dec 2011 00:25:01 +0000 hourly 1 By: Jed http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-4237 Jed Wed, 09 Mar 2011 14:52:28 +0000 http://www.cyberpir8.net/?p=172#comment-4237 Rob, thanks for the link. I agree that knowing why a conflict occurs is not so difficult, but resolving the conflict is still sometimes a pain in the butt. Merging is almost always the only option since nobody wants to lose their work. Coordination is the key to preventing them, which requires organization, which some small groups of developers don't always practice. Oh well, the more you know and so on and so forth <flying-star /> Rob, thanks for the link. I agree that knowing why a conflict occurs is not so difficult, but resolving the conflict is still sometimes a pain in the butt. Merging is almost always the only option since nobody wants to lose their work. Coordination is the key to preventing them, which requires organization, which some small groups of developers don’t always practice. Oh well, the more you know and so on and so forth

]]> By: Rob http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-4236 Rob Wed, 09 Mar 2011 14:15:21 +0000 http://www.cyberpir8.net/?p=172#comment-4236 They are not so bad if you understand what is fundamentally going on: http://www.duchnik.com/tutorials/vc/svn-conflicts They are not so bad if you understand what is fundamentally going on: www.duchnik.com/tutorials/vc/svn-conflicts

]]> By: Jed http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-2512 Jed Fri, 10 Apr 2009 17:47:42 +0000 http://www.cyberpir8.net/?p=172#comment-2512 Michael, Thanks for the response! You're right, I went through the logs of the then-trunk and the branch and there were definitely changes. Now that I've already clobbered all of that, I don't know if it's possible to completely re-create the situation, but I'm going to seek assistance from the SVN user list in the future. Michael,

Thanks for the response! You’re right, I went through the logs of the then-trunk and the branch and there were definitely changes. Now that I’ve already clobbered all of that, I don’t know if it’s possible to completely re-create the situation, but I’m going to seek assistance from the SVN user list in the future.

]]> By: C. Michael Pilato http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-2506 C. Michael Pilato Wed, 08 Apr 2009 13:38:54 +0000 http://www.cyberpir8.net/?p=172#comment-2506 If you discontinued work on your trunk after making your branch, you shouldn't have seen any conflicts at all when merging the branch back to the trunk. It sounds like your workaround was essentially just to replace trunk with your branch (which probably would have been more easily done as 'svn rm url-of-trunk; svn cp url-of-branch url-of-trunk'). That's fine, but (as I said) *should* have been unnecessary. If your repository is publicly accessible, perhaps you could get convince someone on the Subversion users list (users@subversion.tigris.org) to walk with you through the process you used; maybe see if they can spot some wrong turn taken. If you discontinued work on your trunk after making your branch, you shouldn’t have seen any conflicts at all when merging the branch back to the trunk.

It sounds like your workaround was essentially just to replace trunk with your branch (which probably would have been more easily done as ‘svn rm url-of-trunk; svn cp url-of-branch url-of-trunk’). That’s fine, but (as I said) *should* have been unnecessary. If your repository is publicly accessible, perhaps you could get convince someone on the Subversion users list (users@subversion.tigris.org) to walk with you through the process you used; maybe see if they can spot some wrong turn taken.

]]> By: Jed http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-2502 Jed Wed, 08 Apr 2009 05:53:44 +0000 http://www.cyberpir8.net/?p=172#comment-2502 I use Facebook for social interaction. I use my blog to communicate with other nerds (usually). Thanks for checking though! :-) I use Facebook for social interaction. I use my blog to communicate with other nerds (usually). Thanks for checking though! :-)

]]> By: Ginamonster http://www.cyberpir8.net/2009/04/06/subversion-tree-conflicts-make-my-brain-hurt/comment-page-1/#comment-2501 Ginamonster Wed, 08 Apr 2009 02:40:53 +0000 http://www.cyberpir8.net/?p=172#comment-2501 Every so often, I pop in to see if you have started speaking english around here. Apparently, the answer is still "no". Every so often, I pop in to see if you have started speaking english around here. Apparently, the answer is still “no”.

]]>