http://www.vastheman.com/blog/2009/11/11/conflict/ The Anthony Mundine of geeks! Wed, 25 Jan 2012 02:29:37 +0000 hourly 1 http://wordpress.org/?v=3.3.1 http://www.vastheman.com/blog/2009/11/11/conflict/comment-page-1/#comment-49399 Prof Fate Fri, 13 Nov 2009 07:16:52 +0000 http://www.vastheman.com/blog/?p=124#comment-49399 That literally has never happened to me with ClearCase. I suggest avoiding branches. Also, try to get the rest of your team working in a shared directory. That solves most merging problems in my experience, which are usually caused by developers who change code and fiddle with DVCS instead of just using the preprocessor and file system features that have come standard for thirty years. HTH That literally has never happened to me with ClearCase. I suggest avoiding branches. Also, try to get the rest of your team working in a shared directory. That solves most merging problems in my experience, which are usually caused by developers who change code and fiddle with DVCS instead of just using the preprocessor and file system features that have come standard for thirty years. HTH

]]>