http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/ Philosophy and Text Wed, 07 Jan 2009 13:02:03 +0000 http://wordpress.org/?v=2.7 hourly 1 http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/comment-page-1/#comment-4010 The Frog Blog » Bazaar VCS Wed, 23 Jul 2008 20:01:18 +0000 http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/#comment-4010 <p>[...] started using Subversion (SVN) for version control many moons ago, quickly found that it was lacking when it came to merging support. They then used SVK, or at least they did until [...]</p> […] started using Subversion (SVN) for version control many moons ago, quickly found that it was lacking when it came to merging support. They then used SVK, or at least they did until […]

]]> http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/comment-page-1/#comment-4005 Subversion 1.5 at Excursus Tue, 24 Jun 2008 23:39:08 +0000 http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/#comment-4005 <p>[...] 1.5 is out. This is a major release that promised to address many of the problems with merging. New features [...]</p> […] 1.5 is out. This is a major release that promised to address many of the problems with merging. New features […]

]]> http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/comment-page-1/#comment-3398 Getting Git at Excursus Sun, 30 Dec 2007 02:11:39 +0000 http://markelikalderon.com/blog/2007/08/02/the-problem-with-merging/#comment-3398 <p>[...] a continual source of frustration. No commits offline. Limited merging facilities. (See my earlier post.) The limitations on merging is the serious issue for me. Prose production presents opportunities [...]</p> […] a continual source of frustration. No commits offline. Limited merging facilities. (See my earlier post.) The limitations on merging is the serious issue for me. Prose production presents opportunities […]

]]>