http://interactiveasp.net/blogs/spgilmore/archive/2009/02/23/advanced-merging-manual-alignment-with-kdiff3.aspxPhil Gilmore Not all merge programs are equal. Where possible, it's nice to have the merge program automatically resolve any conflicts that it can before forcing you to make any manual merge selections. Of the tools that I've used, KDIFF3 always doesenCommunityServer 2008 (Build: 30417.1769)http://interactiveasp.net/blogs/spgilmore/archive/2009/02/23/advanced-merging-manual-alignment-with-kdiff3.aspx#6733Sun, 03 Jun 2012 16:05:46 GMTb80005ef-4071-4968-b08e-765d7d71b33e:6733Merge-Konflikte manuell aufl??sen -- Christoph J??ngling<p>Pingback from &nbsp;Merge-Konflikte manuell aufl??sen --&nbsp;Christoph J??ngling</p> <img src="http://interactiveasp.net/aggbug.aspx?PostID=6733" width="1" height="1">http://interactiveasp.net/blogs/spgilmore/archive/2009/02/23/advanced-merging-manual-alignment-with-kdiff3.aspx#1211Fri, 31 Jul 2009 09:22:59 GMTb80005ef-4071-4968-b08e-765d7d71b33e:1211Lapo Luchini<p>Mhh, unfortunately doesn&#39;t seems to work every time to me =(</p> <p>The fact that GUI doesn&#39;t show anything about it doesn&#39;t help, for sure.</p> <div style="clear:both;"></div><img src="http://interactiveasp.net/aggbug.aspx?PostID=1211" width="1" height="1">