Comments on: How to resolve Subversion Conflicts http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/ Code Monkey Sat, 13 Mar 2010 16:47:42 +0000 http://wordpress.org/?v=2.9.2 hourly 1 By: Raúl Jiménez Ortega » Introducción a Subversion – 1er Hackatonhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11618 Raúl Jiménez Ortega » Introducción a Subversion – 1er Hackaton Fri, 05 Mar 2010 11:52:59 +0000 http://beta.ariejan.net/?p=141#comment-11618 [...] How to resolve conflicts – With Tortoise Categories: Eventos, Sobre mi, Tecnología Tags: cheatsheet, estsiit, hackaton, jmeld, jre, osl, svn, ugr Comentarios (0) Referencias (0) Dejar un comentario Referencia [...] [...] How to resolve conflicts – With Tortoise Categories: Eventos, Sobre mi, Tecnología Tags: cheatsheet, estsiit, hackaton, jmeld, jre, osl, svn, ugr Comentarios (0) Referencias (0) Dejar un comentario Referencia [...]

]]> By: Chrishttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11428 Chris Tue, 19 Jan 2010 22:06:34 +0000 http://beta.ariejan.net/?p=141#comment-11428 It is really helpful, thanks heaps! It is really helpful, thanks heaps!

]]> By: Adnanhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11302 Adnan Thu, 03 Dec 2009 06:26:59 +0000 http://beta.ariejan.net/?p=141#comment-11302 I'm new to svn. Some days ago I found this "conflict" problem with my project and didn't have any idea what does it mean! Now, after reading your post I know it is the "version number" which controls everything. svn is amazing.. so is your tutorial :)Thanks a lot I’m new to svn. Some days ago I found this “conflict” problem with my project and didn’t have any idea what does it mean!
Now, after reading your post I know it is the “version number” which controls everything. svn is amazing.. so is your tutorial :)

Thanks a lot

]]> By: Joey Novakhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11151 Joey Novak Wed, 11 Nov 2009 22:59:38 +0000 http://beta.ariejan.net/?p=141#comment-11151 Thanks for this info, it's a nice quick help. Thanks for this info, it’s a nice quick help.

]]> By: Ariejan de Vroomhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11019 Ariejan de Vroom Mon, 19 Oct 2009 14:35:49 +0000 http://beta.ariejan.net/?p=141#comment-11019 @Роман Макаров - No you cannot. You are free to link to my site, though. @Роман Макаров – No you cannot. You are free to link to my site, though.

]]> By: Роман Макаровhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-11018 Роман Макаров Mon, 19 Oct 2009 13:12:18 +0000 http://beta.ariejan.net/?p=141#comment-11018 Скажите, а можно ли взять какие-нибудь статьи с вашего сайта? Со ссылкой на первоисточник естественно. :) Скажите, а можно ли взять какие-нибудь статьи с вашего сайта? Со ссылкой на первоисточник естественно. :)

]]> By: 1001fontshttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-10979 1001fonts Wed, 30 Sep 2009 19:36:22 +0000 http://beta.ariejan.net/?p=141#comment-10979 Boy did I feel stuck before reading this post. I wish this page would have showed up first on google for: svn resolve conflict Boy did I feel stuck before reading this post. I wish this page would have showed up first on google for: svn resolve conflict

]]> By: Shadihttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-10837 Shadi Thu, 09 Jul 2009 12:05:48 +0000 http://beta.ariejan.net/?p=141#comment-10837 I ack Kenny, except that it's "its" not "it's", but who cares? I ack Kenny, except that it’s “its” not “it’s”, but who cares?

]]> By: halilhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-10836 halil Thu, 09 Jul 2009 11:04:47 +0000 http://beta.ariejan.net/?p=141#comment-10836 Thanks, it was very helpful Thanks, it was very helpful

]]> By: Logan Paulsonhttp://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/comment-page-1/#comment-10733 Logan Paulson Tue, 12 May 2009 22:23:37 +0000 http://beta.ariejan.net/?p=141#comment-10733 Thanks, this is just what I was looking for. Thanks, this is just what I was looking for.

]]>