Comments on: How to do 3-way merges with Subversion and Kdiff3 http://jawspeak.com/2009/09/17/how-to-do-3-way-merges-with-subversion-and-kdiff3/ Jonathan Andrew Wolter Wed, 04 Jan 2012 06:55:15 +0000 http://wordpress.org/?v=2.9.2 hourly 1 By: Jonathan Andrew Wolter: Subversion Branch Merging and Tree Conflicts | Software Secret Weapons http://jawspeak.com/2009/09/17/how-to-do-3-way-merges-with-subversion-and-kdiff3/comment-page-1/#comment-2137 Jonathan Andrew Wolter: Subversion Branch Merging and Tree Conflicts | Software Secret Weapons Sat, 06 Nov 2010 15:58:44 +0000 http://jawspeak.com/?p=140#comment-2137 [...] written several times about how I recommend avoiding long lived feature branches. But, if you have to use these, [...] [...] written several times about how I recommend avoiding long lived feature branches. But, if you have to use these, [...]

]]> By: Subversion Branch Merging and Tree Conflicts at JAW Speak http://jawspeak.com/2009/09/17/how-to-do-3-way-merges-with-subversion-and-kdiff3/comment-page-1/#comment-2127 Subversion Branch Merging and Tree Conflicts at JAW Speak Sat, 06 Nov 2010 09:02:04 +0000 http://jawspeak.com/?p=140#comment-2127 [...] written several times about how I recommend avoiding long lived feature branches. But, if you have to use these, [...] [...] written several times about how I recommend avoiding long lived feature branches. But, if you have to use these, [...]

]]> By: Jonathan Andrew Wolter: Subversion Parallel Multi-Branch Development And Merging | Software Secret Weapons http://jawspeak.com/2009/09/17/how-to-do-3-way-merges-with-subversion-and-kdiff3/comment-page-1/#comment-2119 Jonathan Andrew Wolter: Subversion Parallel Multi-Branch Development And Merging | Software Secret Weapons Wed, 03 Nov 2010 14:51:33 +0000 http://jawspeak.com/?p=140#comment-2119 [...] discussed in my previous post, I dislike merging-based-development, preferring Trunk Based Development instead. But, sometimes you’re stuck with a long-lived [...] [...] discussed in my previous post, I dislike merging-based-development, preferring Trunk Based Development instead. But, sometimes you’re stuck with a long-lived [...]

]]> By: Subversion Parallel Multi-Branch Development And Merging at JAW Speak http://jawspeak.com/2009/09/17/how-to-do-3-way-merges-with-subversion-and-kdiff3/comment-page-1/#comment-2117 Subversion Parallel Multi-Branch Development And Merging at JAW Speak Wed, 03 Nov 2010 09:21:24 +0000 http://jawspeak.com/?p=140#comment-2117 [...] discussed in my previous post, I dislike merging-based-development, preferring Trunk Based Development instead. But, sometimes you’re stuck with a long-lived [...] [...] discussed in my previous post, I dislike merging-based-development, preferring Trunk Based Development instead. But, sometimes you’re stuck with a long-lived [...]

]]>